From e9ae84b85207a0663b8b15b828148654fd5541df Mon Sep 17 00:00:00 2001 From: khongchi Date: Mon, 18 Aug 2014 16:31:20 +0900 Subject: [PATCH] =?UTF-8?q?#851=20Context::convertEncodingStr=EC=9D=98=20?= =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=82=AC=EC=9A=A9=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- classes/context/Context.class.php | 1 + classes/module/ModuleHandler.class.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 8c2f7788c..e080f8f49 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -1057,6 +1057,7 @@ class Context */ function convertEncodingStr($str) { + if(!$str) return null; $obj = new stdClass(); $obj->str = $str; $obj = self::convertEncoding($obj); diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index d5c273801..eafb9017e 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -59,7 +59,10 @@ class ModuleHandler extends Handler $this->mid = $mid ? $mid : Context::get('mid'); $this->document_srl = $document_srl ? (int) $document_srl : (int) Context::get('document_srl'); $this->module_srl = $module_srl ? (int) $module_srl : (int) Context::get('module_srl'); - $this->entry = Context::convertEncodingStr(Context::get('entry')); + if($entry = Context::get('entry')) + { + $this->entry = Context::convertEncodingStr($entry); + } // Validate variables to prevent XSS $isInvalid = NULL;