fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 19:21:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Do not display xpresseditor as an option even if it is installed

Browse source
This commit is contained in:
Kijin Sung 2017-09-28 18:07:45 +09:00
parent e3b48d2604
commit 9d95873a77
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/editor/editor.admin.view.php
View file

@ -45,6 +45,7 @@ class editorAdminView extends editor
$component_list = $oEditorModel->getComponentList(false, $site_srl, true);
$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
$editor_skin_list = array_filter($editor_skin_list, function($name) { return !starts_with('xpresseditor', $name); });
$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->editor_skin);
$comment_skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->comment_editor_skin);

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

@ -215,7 +215,7 @@ class editorModel extends editor
{
$option->editor_skin = $option->skin;
}
if (!$option->editor_skin || !file_exists($this->module_path . 'skins/' . $option->editor_skin . '/editor.html'))
if (!$option->editor_skin || !file_exists($this->module_path . 'skins/' . $option->editor_skin . '/editor.html') || starts_with('xpresseditor', $option->editor_skin))
{
$option->editor_skin = $this->default_editor_config['editor_skin'];
}

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

@ -99,6 +99,7 @@ class editorView extends editor
$oModuleModel = getModel('module');
// Get a list of editor skin
$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
$editor_skin_list = array_filter($editor_skin_list, function($name) { return !starts_with('xpresseditor', $name); });
Context::set('editor_skin_list', $editor_skin_list);
$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->editor_skin);