From: Michael Dale <dale@users.mediawiki.org>
Date: Thu, 10 Sep 2009 19:24:56 +0000 (+0000)
Subject: * 3983#c3983 array casting does not work so well on json_decode arrays... object2arra... 
X-Git-Tag: 1.31.0-rc.0~39801
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=f6a57deb50c8ae33d0e4420a65e10b7977776233;p=lhc%2Fweb%2Fwiklou.git

* 3983#c3983 array casting does not work so well on json_decode arrays... object2array should work
---

diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index 024148f906..3fbb21bf54 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -23,7 +23,7 @@ class FormatJson{
 			$json = new Services_JSON();
 			$jsonDec = $json->decode($value);
 			if($assoc)
-				$jsonDec = (array) $jsonDec;
+				$jsonDec = wfObjectToArray( $jsonDec );
 			return $jsonDec;
 		} else {
 			return json_decode($value, $assoc);