extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-03 20:09:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

not using options parameter on json_encode, as PHP5.2 returns empty string and loading template class only, if not autoloadable

Browse Source
This commit is contained in:
Ralf Becker 2010-06-02 18:11:15 +00:00
parent d9b9e79fcd
commit ea57302fce
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpgwapi/inc/class.egw_json.inc.php
View File

@ -70,7 +70,7 @@ class egw_json_request
{ {
@list($appName, $className, $functionName, $handler) = explode('.',$menuaction); @list($appName, $className, $functionName, $handler) = explode('.',$menuaction);
} }
error_log("xajax.php: appName=$appName, className=$className, functionName=$functionName, handler=$handler"); //error_log("json.php: appName=$appName, className=$className, functionName=$functionName, handler=$handler");
switch($handler) switch($handler)
{ {
@ -110,7 +110,7 @@ class egw_json_request
if (isset($template)) if (isset($template))
{ {
require_once(EGW_SERVER_ROOT.'/phpgwapi/templates/'.$template.'/class.'.$className.'.inc.php'); if (!class_exists($className)) require_once(EGW_SERVER_ROOT.'/phpgwapi/templates/'.$template.'/class.'.$className.'.inc.php');
$ajaxClass = new $className; $ajaxClass = new $className;
} }
else else
@ -309,7 +309,7 @@ class egw_json_response
/* Wrap the result array into a parent "response" Object */ /* Wrap the result array into a parent "response" Object */
$res = array('response' => $this->responseArray); $res = array('response' => $this->responseArray);
return json_encode($res, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP); return json_encode($res); //PHP5.3+, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP);
} }
/** /**