From 24ab7dba9ebd1e19a73648ac0f519b82c36732c5 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 29 Jun 2017 19:39:18 +0900 Subject: [PATCH] Fix erroneous identification of nohtml config --- modules/comment/comment.controller.php | 4 ++-- modules/document/document.controller.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index f116140ee..b0530fda7 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -437,7 +437,7 @@ class commentController extends comment if(!$manual_inserted) { $editor_config = getModel('editor')->getEditorConfig($obj->module_srl); - if (strpos($editor_config->comment_editor_skin, 'textarea') !== false || strpos($editor_config->sel_comment_editor_colorset, 'nohtml') !== false) + if (strpos($editor_config->sel_comment_editor_colorset, 'nohtml') !== false) { $is_html_content = false; } @@ -811,7 +811,7 @@ class commentController extends comment if(!$manual_updated) { $editor_config = getModel('editor')->getEditorConfig($obj->module_srl); - if (strpos($editor_config->comment_editor_skin, 'textarea') !== false || strpos($editor_config->sel_comment_editor_colorset, 'nohtml') !== false) + if (strpos($editor_config->sel_comment_editor_colorset, 'nohtml') !== false) { $is_html_content = false; } diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 5b14e545b..f98144af8 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -458,7 +458,7 @@ class documentController extends document if(!$manual_inserted) { $editor_config = getModel('editor')->getEditorConfig($obj->module_srl); - if (strpos($editor_config->comment_editor_skin, 'textarea') !== false || strpos($editor_config->sel_comment_editor_colorset, 'nohtml') !== false) + if (strpos($editor_config->sel_editor_colorset, 'nohtml') !== false) { $is_html_content = false; } @@ -717,7 +717,7 @@ class documentController extends document if(!$manual_updated) { $editor_config = getModel('editor')->getEditorConfig($obj->module_srl); - if (strpos($editor_config->comment_editor_skin, 'textarea') !== false || strpos($editor_config->sel_comment_editor_colorset, 'nohtml') !== false) + if (strpos($editor_config->sel_editor_colorset, 'nohtml') !== false) { $is_html_content = false; }