Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Pb in json function for objects

Browse Source
This commit is contained in:
Laurent Destailleur
2012-12-29 12:21:13 +01:00
parent 7d60c33c1a
commit ca6e9643ea
5 changed files with 244 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/lib/json.lib.php
View File

@@ -45,7 +45,13 @@ if (! function_exists('json_encode'))
*/
function dol_json_encode($elements)
{
$num = count($elements);
$num=count($elements);
if (is_object($elements)) // Count number of properties for an object
{
$num=0;
foreach($elements as $key => $value) $num++;
}
//var_dump($num);
// determine type
if (is_numeric(key($elements)))
@@ -56,7 +62,7 @@ function dol_json_encode($elements)
{
if (is_array($elements[$i]) || is_object($elements[$i])) $output.= json_encode($elements[$i]);
else $output .= _val($elements[$i]);
if($i !== $last) $output.= ',';
if ($i !== $last) $output.= ',';
}
$output.= ']';
}