From 17a3204578224f9be044c87c1de997454d1a8273 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Dec 2012 06:51:12 +0100
Subject: [PATCH] Fix: dol_json_encode was wrong with objects

---
 htdocs/core/lib/json.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index cf3fa89c655..73907fd5f23 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -54,7 +54,7 @@ function dol_json_encode($elements)
 		$output = '[';
 		for ($i = 0, $last = ($num - 1); isset($elements[$i]); ++$i)
 		{
-			if (is_array($elements[$i])) $output.= json_encode($elements[$i]);
+			if (is_array($elements[$i]) || is_object($elements[$i])) $output.= json_encode($elements[$i]);
 			else $output .= _val($elements[$i]);
 			if($i !== $last) $output.= ',';
 		}