From 66e276c969e75138451a6cb4cef8a8fbc2347fd5 Mon Sep 17 00:00:00 2001 From: conory Date: Fri, 14 Jul 2017 21:22:12 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BB=A8=EB=B2=84=ED=84=B0=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EC=86=8C=EB=AC=B8=EC=9E=90=EB=A1=9C=20=ED=86=B5?= =?UTF-8?q?=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/editor/editor.model.php | 12 ++++++------ modules/editor/skins/textarea/skin.xml | 2 +- modules/member/member.controller.php | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index 06b266a25..24893ebb4 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -932,11 +932,11 @@ class editorModel extends editor // Check if ($config->allow_html === 'N' || $obj->use_html === 'N') { - $converter[] = 'Text'; + $converter[] = 'text'; } elseif (strpos($type == 'comment' ? $config->sel_comment_editor_colorset : $config->sel_editor_colorset, 'nohtml') !== false) { - $converter[] = 'Text'; + $converter[] = 'text'; } if (!is_html_content($obj->content) || $obj->use_editor === 'N') { @@ -947,21 +947,21 @@ class editorModel extends editor if ($converter) { // To Text - if (in_array('Text', $converter)) + if (in_array('text', $converter)) { $obj->content = escape(strip_tags($obj->content), false); } // To HTML - if (in_array('Text2HTML', $converter)) + if (in_array('text2html', $converter)) { $obj->content = Rhymix\Framework\Formatter::text2html($obj->content); } - elseif (in_array('Markdown2HTML', $converter)) + elseif (in_array('markdown2html', $converter)) { $obj->content = Rhymix\Framework\Formatter::markdown2html($obj->content); } - elseif (in_array('Bbcode2HTML', $converter)) + elseif (in_array('bbcode', $converter)) { $obj->content = Rhymix\Framework\Formatter::bbcode($obj->content); } diff --git a/modules/editor/skins/textarea/skin.xml b/modules/editor/skins/textarea/skin.xml index db5562f62..af395ea5d 100644 --- a/modules/editor/skins/textarea/skin.xml +++ b/modules/editor/skins/textarea/skin.xml @@ -13,6 +13,6 @@ - + diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 95030d435..4f7b5b5d9 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1629,7 +1629,7 @@ class memberController extends member $config = getModel('member')->getMemberConfig(); if($config->signature_html == 'N') { - $obj->converter = 'Text'; + $obj->converter = 'text'; } $obj->content = $signature; $obj->editor_skin = $config->signature_editor_skin;