fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 20:44:28 +09:00
Code Issues Projects Releases Packages Wiki Activity

Update CKEditor timestamp if editor module config is updated #2173

Browse source
This commit is contained in:
Kijin Sung 2023-09-12 23:03:12 +09:00
parent ec674dc25f
commit 68ee78f1f8
4 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/editor/editor.admin.controller.php
View file

@ -44,6 +44,10 @@ class editorAdminController extends editor
$output = $this->editorCheckUse($componentList,$site_module_info->site_srl); $output = $this->editorCheckUse($componentList,$site_module_info->site_srl);
if(!$output->toBool()) return new BaseObject(); if(!$output->toBool()) return new BaseObject();
$config = ModuleModel::getModuleConfig('editor') ?: new stdClass;
$config->timestamp = time();
ModuleController::getInstance()->insertModuleConfig('editor', $config);
$oEditorController = getController('editor'); $oEditorController = getController('editor');
$oEditorController->removeCache($site_module_info->site_srl); $oEditorController->removeCache($site_module_info->site_srl);
$this->setRedirectUrl(Context::get('error_return_url')); $this->setRedirectUrl(Context::get('error_return_url'));
@ -239,6 +243,7 @@ class editorAdminController extends editor
$config->autoinsert_types[$type] = true; $config->autoinsert_types[$type] = true;
} }
$config->autoinsert_position = in_array($configVars->autoinsert_position, array('paragraph', 'inline')) ? $configVars->autoinsert_position : 'paragraph'; $config->autoinsert_position = in_array($configVars->autoinsert_position, array('paragraph', 'inline')) ? $configVars->autoinsert_position : 'paragraph';
$config->timestamp = time();
$oModuleController->insertModuleConfig('editor', $config); $oModuleController->insertModuleConfig('editor', $config);
$this->setRedirectUrl(Context::get('error_return_url')); $this->setRedirectUrl(Context::get('error_return_url'));

1
modules/editor/editor.class.php
View file

@ -57,6 +57,7 @@ class editor extends ModuleObject
'additional_mobile_css' => array(), 'additional_mobile_css' => array(),
'additional_plugins' => array(), 'additional_plugins' => array(),
'remove_plugins' => array('liststyle', 'tabletools', 'tableselection', 'contextmenu', 'exportpdf'), 'remove_plugins' => array('liststyle', 'tabletools', 'tableselection', 'contextmenu', 'exportpdf'),
'timestamp' => 0,
); );
/** /**

3
modules/editor/editor.model.php
View file

@ -265,6 +265,9 @@ class editorModel extends editor
// Check an option whether to start the editor manually. // Check an option whether to start the editor manually.
Context::set('editor_manual_start', $option->manual_start ?? null); Context::set('editor_manual_start', $option->manual_start ?? null);
// Add the timestamp for the editor module config.
Context::set('editor_config_timestamp', $option->timestamp ?? 0);
// Compile and return the editor skin template. // Compile and return the editor skin template.
$tpl_path = Context::get('editor_path'); $tpl_path = Context::get('editor_path');
Context::loadLang($tpl_path.'lang'); Context::loadLang($tpl_path.'lang');

2
modules/editor/skins/ckeditor/editor.html
View file

@ -137,7 +137,7 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
CKEDITOR.dtd.$removeEmpty.ins = 0; CKEDITOR.dtd.$removeEmpty.ins = 0;
// Set the timestamp for plugins. // Set the timestamp for plugins.
CKEDITOR.timestamp = '{strtoupper(dechex(max($ckeditor_main_filemtime, $ckeditor_config_filemtime)))}'; CKEDITOR.timestamp = '{strtoupper(dechex(max($ckeditor_main_filemtime, $ckeditor_config_filemtime, $editor_config_timestamp ?? 0)))}';
// Add editor components. // Add editor components.
<!--@if($enable_component)--> <!--@if($enable_component)-->