From 24a6f0e615e51d6defa24c9fdd100a7b9f7d1141 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 2 May 2024 00:32:55 +0900 Subject: [PATCH] Fix type error when editor add/remove plugins variable contains an empty string --- modules/editor/editor.model.php | 6 +++--- modules/editor/skins/ckeditor/config.blade.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index 576947789..dfa3a581d 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -189,9 +189,9 @@ class EditorModel extends Editor Context::set('content_word_break', $option->content_word_break ?? null); Context::set('editor_autoinsert_types', $option->autoinsert_types ?? (($option->autoinsert_image ?? null) !== 'none' ? self::$default_editor_config['autoinsert_types'] : [])); Context::set('editor_autoinsert_position', $option->autoinsert_position ?? ($option->autoinsert_image ?? null)); - Context::set('editor_additional_css', $option->additional_css ?? ''); - Context::set('editor_additional_plugins', $option->additional_plugins ?? ''); - Context::set('editor_remove_plugins', $option->remove_plugins ?? ''); + Context::set('editor_additional_css', $option->additional_css ?? []); + Context::set('editor_additional_plugins', $option->additional_plugins ?? []); + Context::set('editor_remove_plugins', $option->remove_plugins ?? []); // Set the primary key valueof the document or comments Context::set('editor_primary_key_name', $option->primary_key_name); diff --git a/modules/editor/skins/ckeditor/config.blade.php b/modules/editor/skins/ckeditor/config.blade.php index 31766356a..0f586a3a7 100644 --- a/modules/editor/skins/ckeditor/config.blade.php +++ b/modules/editor/skins/ckeditor/config.blade.php @@ -13,8 +13,8 @@ $ckconfig->focus = $editor_focus ?? false; $ckconfig->ios_patch = (bool)preg_match('/i(Phone|Pad|Pod)/', $_SERVER['HTTP_USER_AGENT'] ?? ''); // Plugin configuration -$ckconfig->add_plugins = $editor_additional_plugins ?? []; -$ckconfig->remove_plugins = $editor_remove_plugins ?? []; +$ckconfig->add_plugins = $editor_additional_plugins ?: []; +$ckconfig->remove_plugins = $editor_remove_plugins ?: []; if (!in_array('clipboard', $ckconfig->remove_plugins)) { $ckconfig->add_plugins[] = 'rx_paste'; }