From d3051f8db19fc863d2e8f0084a44051ac5d67b20 Mon Sep 17 00:00:00 2001
From: Torben Hansen <derhansen@gmail.com>
Date: Sat, 22 Jul 2023 14:23:17 +0200
Subject: [PATCH] [BUGFIX] Ensure CKEditor ui language is always set
If the CKEditor configuration has a language configuration, but does not
define the `ui` language setting, no fallback language is added to the
editor configuration and an undefined array key exception is thrown.
This change ensures, that the `ui` language is properly set when
the editor configuration has a language configuration and the
`ui` language is missing.
Resolves: #101401
Releases: main, 12.4
Signed-off-by: Torben Hansen <derhansen@gmail.com>
Change-Id: Id8bc03fd832413cf6ed1f9c5d443fa9f3387811c
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/80575
Tested-by: Andreas Nedbal <andy@pixelde.su>
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Andreas Nedbal <andy@pixelde.su>
---
.../rte_ckeditor/Classes/Form/Element/RichTextElement.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php b/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
index a45db40ae6bf..5750924ab3dc 100644
--- a/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
+++ b/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
@@ -376,7 +376,9 @@ class RichTextElement extends AbstractFormElement
->getConfiguration();
// Set the UI language of the editor if not hard-coded by the existing configuration
- if (empty($configuration['language'])) {
+ if (empty($configuration['language']) ||
+ (is_array($configuration['language']) && empty($configuration['language']['ui']))
+ ) {
$userLang = (string)($this->getBackendUser()->user['lang'] ?: 'en');
$configuration['language']['ui'] = $userLang === 'default' ? 'en' : $userLang;
} elseif (!is_array($configuration['language'])) {
--
GitLab