From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Thu, 10 Mar 2011 12:04:38 +0000 (+0000)
Subject: Revert r83647, was based on the inability to read the function signature
X-Git-Tag: 1.31.0-rc.0~31527
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=cd311a16786fb80871de8066a6cd2b6000705a15;p=lhc%2Fweb%2Fwiklou.git

Revert r83647, was based on the inability to read the function signature
---

diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index 26f3762f20..f9667f54ba 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -58,7 +58,7 @@ class FormatJson {
 			$jsonDec = $json->decode( $value );
 			return $jsonDec;
 		} else {
-			return wfObjectToArray( json_decode( $value, $assoc ) );
+			return json_decode( $value, $assoc );
 		}
 	}