From 6c5f9aadd1b4df3ec083c232638b6526e83e4263 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 8 Jan 2016 20:38:35 +0900 Subject: [PATCH] Don't use home-made JSON encoder in display handlers --- classes/display/JSCallbackDisplayHandler.php | 4 +--- classes/display/JSONDisplayHandler.php | 3 +-- classes/template/TemplateHandler.class.php | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/classes/display/JSCallbackDisplayHandler.php b/classes/display/JSCallbackDisplayHandler.php index 314a205b2..2926a5066 100644 --- a/classes/display/JSCallbackDisplayHandler.php +++ b/classes/display/JSCallbackDisplayHandler.php @@ -14,14 +14,12 @@ class JSCallbackDisplayHandler $variables = $oModule->getVariables(); $variables['error'] = $oModule->getError(); $variables['message'] = $oModule->getMessage(); - $json = str_replace(array("\r\n", "\n", "\t"), array('\n', '\n', '\t'), json_encode2($variables)); return sprintf('', Context::getJSCallbackFunc(), $json); +', Context::getJSCallbackFunc(), json_encode($variables)); } - } /* End of file JSCallback.class.php */ /* Location: ./classes/display/JSCallback.class.php */ diff --git a/classes/display/JSONDisplayHandler.php b/classes/display/JSONDisplayHandler.php index 4befddc58..7ed3bf2fd 100644 --- a/classes/display/JSONDisplayHandler.php +++ b/classes/display/JSONDisplayHandler.php @@ -14,8 +14,7 @@ class JSONDisplayHandler $variables = $oModule->getVariables(); $variables['error'] = $oModule->getError(); $variables['message'] = $oModule->getMessage(); - $json = str_replace(array("\r\n", "\n", "\t"), array('\n', '\n', '\t'), json_encode2($variables)); - return $json; + return json_encode($variables); } } diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php index 515713c9e..6eb65d6d7 100644 --- a/classes/template/TemplateHandler.class.php +++ b/classes/template/TemplateHandler.class.php @@ -73,11 +73,11 @@ class TemplateHandler protected function init($tpl_path, $tpl_filename, $tpl_file = '') { // verify arguments - if(substr($tpl_path, -1) != '/') + if(!$tpl_path || substr($tpl_path, -1) != '/') { $tpl_path .= '/'; } - if(!is_dir($tpl_path)) + if($tpl_path === '/' || !is_dir($tpl_path)) { return; }