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

Fix: json

Browse Source
This commit is contained in:
Laurent Destailleur
2013-10-11 18:33:21 +02:00
parent 56730741bc
commit de97cd1812
2 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,14 +54,16 @@ function dol_json_encode($elements)
//var_dump($num);
// determine type
if (is_numeric(key($elements)))
if (is_numeric(key($elements)) && key($elements) == 0)
{
// indexed (list)
$keysofelements=array_keys($elements); // Elements array mus have key that does not start with 0 and end with num-1, so we will use this later.
$output = '[';
for ($i = 0, $last = ($num - 1); isset($elements[$i]); ++$i)
for ($i = 0, $last = ($num - 1); $i < $num; $i++)
{
if (is_array($elements[$i]) || is_object($elements[$i])) $output.= json_encode($elements[$i]);
else $output .= _val($elements[$i]);
if (! isset($elements[$keysofelements[$i]])) continue;
if (is_array($elements[$keysofelements[$i]]) || is_object($elements[$keysofelements[$i]])) $output.= json_encode($elements[$keysofelements[$i]]);
else $output .= _val($elements[$keysofelements[$i]]);
if ($i !== $last) $output.= ',';
}
$output.= ']';