lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: PHPUnit Regression

Browse Source
This commit is contained in:
Laurent Destailleur 2013-04-14 23:57:07 +02:00
parent 67052933ca
commit 36c55971b5
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,8 +72,10 @@ function dol_json_encode($elements)
$output = '{'; $output = '{';
$last = $num - 1; $last = $num - 1;
$i = 0; $i = 0;
if (is_array($elements) && count($elements)>0) { $tmpelements=array();
foreach($elements as $key => $value) if (is_array($elements)) $tmpelements=$elements;
if (is_object($elements)) $tmpelements=get_object_vars($elements);
foreach($tmpelements as $key => $value)
{ {
$output .= '"'.$key.'":'; $output .= '"'.$key.'":';
if (is_array($value)) $output.= json_encode($value); if (is_array($value)) $output.= json_encode($value);
@ -81,7 +83,6 @@ function dol_json_encode($elements)
if ($i !== $last) $output.= ','; if ($i !== $last) $output.= ',';
++$i; ++$i;
} }
}
$output.= '}'; $output.= '}';
} }