Merge branch 'support/3.2' into develop

This commit is contained in:
Stephen Abello
2024-04-16 09:22:58 +02:00
1084 changed files with 82136 additions and 23375 deletions

View File

@@ -4,6 +4,7 @@
* @license http://opensource.org/licenses/AGPL-3.0
*/
use Combodo\iTop\Application\Helper\CKEditorHelper;
use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Form\Form;
@@ -627,7 +628,7 @@ function GetTabsNavigationFieldBlock(): iUIBlock
*/
function GetRichTextToolbarExpandedFieldBlock(): iUIBlock
{
$bCurrentValue = isset(utils::GetCkeditorPref()['toolbarStartupExpanded']) ? (bool)utils::GetCkeditorPref()['toolbarStartupExpanded'] : false;
$bCurrentValue = isset(CKEditorHelper::GetCkeditorPref()['toolbarStartupExpanded']) ? (bool)CKEditorHelper::GetCkeditorPref()['toolbarStartupExpanded'] : false;
$sCurrentValueAsString = $bCurrentValue ? 'true' : 'false';
$aOptionsValues = [