From 9d95873a779c701851f57e9f0be1f291cd2fbdf7 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Thu, 28 Sep 2017 18:07:45 +0900
Subject: [PATCH] Do not display xpresseditor as an option even if it is
 installed

---
 modules/editor/editor.admin.view.php | 1 +
 modules/editor/editor.model.php      | 2 +-
 modules/editor/editor.view.php       | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/editor/editor.admin.view.php b/modules/editor/editor.admin.view.php
index f5d69b42b..e2b87569a 100644
--- a/modules/editor/editor.admin.view.php
+++ b/modules/editor/editor.admin.view.php
@@ -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);
diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index 13a096e52..83d02475d 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -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'];
 		}
diff --git a/modules/editor/editor.view.php b/modules/editor/editor.view.php
index 574fda2af..ffea382f6 100644
--- a/modules/editor/editor.view.php
+++ b/modules/editor/editor.view.php
@@ -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);