From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 11 Aug 2010 13:03:45 +0000 (+0000)
Subject: Followup r70875, fix default value for decode()
X-Git-Tag: 1.31.0-rc.0~35550
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=ddbca1b0390ceae9faa27377416d7fd9f9831274;p=lhc%2Fweb%2Fwiklou.git

Followup r70875, fix default value for decode()
---

diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index ee9d80083a..cacf6680fc 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -19,7 +19,7 @@ class FormatJson {
 		}
 	}
 
-	public static function decode( $value, $assoc = self::AS_ARRAY ) {
+	public static function decode( $value, $assoc = false ) {
 		if ( !function_exists( 'json_decode' ) ) {
 			$json = new Services_JSON();
 			$jsonDec = $json->decode( $value );