holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add handling for in case the input data comes pre-parsed

Browse Source
This commit is contained in:
Nathan Gray 2010-06-09 12:57:36 +00:00
parent 9d4c60bc42
commit a09a58ae11
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,9 +30,17 @@ class egw_json_request
$this->handleRequest($menuaction, array()); $this->handleRequest($menuaction, array());
} }
else else
{
if(!is_array($input_data))
{ {
//Decode the JSON input data into associative arrays //Decode the JSON input data into associative arrays
if (($json = json_decode(stripslashes($input_data[0]), true))) $json = json_decode($input_data, true);
}
else
{
$json = $input_data;
}
if(is_array($json))
{ {
//Get the request array //Get the request array
if (isset($json['request'])) if (isset($json['request']))