From ae7920a276224f666ddb84972dd0186dd4ca1641 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sun, 28 Apr 2024 22:29:45 +0900 Subject: [PATCH] Fix #2309 support Blade template as main file of editor skin --- modules/editor/editor.model.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index 31dffde24..576947789 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -149,7 +149,11 @@ class EditorModel extends Editor { $option->editor_skin = $option->skin ?? null; } - if (empty($option->editor_skin) || !file_exists('./modules/editor/skins/' . $option->editor_skin . '/editor.html') || starts_with('xpresseditor', $option->editor_skin) || starts_with('dreditor', $option->editor_skin)) + if (empty($option->editor_skin) || starts_with('xpresseditor', $option->editor_skin) || starts_with('dreditor', $option->editor_skin)) + { + $option->editor_skin = self::$default_editor_config['editor_skin']; + } + if (!file_exists('./modules/editor/skins/' . $option->editor_skin . '/editor.html') && !file_exists('./modules/editor/skins/' . $option->editor_skin . '/editor.blade.php')) { $option->editor_skin = self::$default_editor_config['editor_skin']; } @@ -305,7 +309,7 @@ class EditorModel extends Editor Context::loadLang($tpl_path.'lang'); $oTemplate = TemplateHandler::getInstance(); - return $oTemplate->compile($tpl_path, 'editor.html'); + return $oTemplate->compile($tpl_path, 'editor'); } /**