From 469ae91e70a4517e9bcc0849fd7111dac9ef98ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 May 2013 12:02:39 +0200
Subject: [PATCH] Fix: regression
---
htdocs/core/lib/json.lib.php | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 24464898a28..9b6f5a95d62 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -72,15 +72,16 @@ function dol_json_encode($elements)
$output = '{';
$last = $num - 1;
$i = 0;
- if (is_array($elements) && count($elements)>0) {
- foreach($elements as $key => $value)
- {
- $output .= '"'.$key.'":';
- if (is_array($value)) $output.= json_encode($value);
- else $output .= _val($value);
- if ($i !== $last) $output.= ',';
- ++$i;
- }
+ $tmpelements=array();
+ if (is_array($elements)) $tmpelements=$elements;
+ if (is_object($elements)) $tmpelements=get_object_vars($elements);
+ foreach($tmpelements as $key => $value)
+ {
+ $output .= '"'.$key.'":';
+ if (is_array($value)) $output.= json_encode($value);
+ else $output .= _val($value);
+ if ($i !== $last) $output.= ',';
+ ++$i;
}
$output.= '}';
}
--
GitLab