fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Don't use home-made JSON encoder in display handlers

Browse source
This commit is contained in:
Kijin Sung 2016-01-08 20:38:35 +09:00
parent a74ed519e0
commit 6c5f9aadd1
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/display/JSCallbackDisplayHandler.php
View file

@ -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('<script type="text/javascript">
//<![CDATA[
%s(%s);
//]]>
</script>', Context::getJSCallbackFunc(), $json);
</script>', Context::getJSCallbackFunc(), json_encode($variables));
}
}
/* End of file JSCallback.class.php */
/* Location: ./classes/display/JSCallback.class.php */

3
classes/display/JSONDisplayHandler.php
View file

@ -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);
}
}

4
classes/template/TemplateHandler.class.php
View file

@ -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;
}