UHF-9932: Must check if the required is set and is array before anyth…

…ing happens. Also make sure the revering is not done when language is ltr
City-of-Helsinki · Apr 9, 2024 · e5719a6 · e5719a6
1 parent 41a9cbd
commit e5719a6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/modules/helfi_ckeditor/helfi_ckeditor.module b/modules/helfi_ckeditor/helfi_ckeditor.module
@@ -57,7 +57,12 @@ function helfi_ckeditor_js_settings_alter(array &$settings) {
 
   foreach ($settings['editor']['formats'] as $name => $array) {
     $settings['editor']['formats'][$name]['editorSettings']['language']['ui'] = $language_id;
-    if ($ui_language_direction === 'ltr') {
+    if (
+      $ui_language_direction === 'ltr' &&
+      $content_language->getDirection() == 'rtl' &&
+      isset($settings['editor']['formats'][$name]['editorSettings']['toolbar']['items']) &&
+      is_array($settings['editor']['formats'][$name]['editorSettings']['toolbar']['items'])
+    ) {
       $settings['editor']['formats'][$name]['editorSettings']['toolbar']['items'] = array_reverse(
         $settings['editor']['formats'][$name]['editorSettings']['toolbar']['items']
       );