X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fjson%2FFormatJson.php;h=cae3f12a5e772caeaba01c852d6b2d5fe325fd34;hb=a86ae844e648c31ad7216738d4914802c0e60c07;hp=cf49c17bec06e37a95e1ed1a2af2acb8c95c25ed;hpb=539ab6f5e5f730a4dae78fa34780689897ec4675;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index cf49c17bec..cae3f12a5e 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -1,26 +1,50 @@
 <?php
 /**
- * Simple wrapper for json_econde and json_decode that falls back on Services_JSON class
+ * Simple wrapper for json_econde and json_decode that falls back on Services_JSON class.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
  */
-if ( !defined( 'MEDIAWIKI' ) ) {
-	die( 1 );
-}
 
+require_once dirname( __FILE__ ) . '/Services_JSON.php';
+
+/**
+ * JSON formatter wrapper class
+ */
 class FormatJson {
-	
+
 	/**
 	 * Returns the JSON representation of a value.
-	 * 
+	 *
 	 * @param $value Mixed: the value being encoded. Can be any type except a resource.
 	 * @param $isHtml Boolean
-	 * 
+	 *
+	 * @todo FIXME: "$isHtml" parameter's purpose is not documented. It appears to
+	 *        map to a parameter labeled "pretty-print output with indents and
+	 *        newlines" in Services_JSON::encode(), which has no string relation
+	 *        to HTML output.
+	 *
 	 * @return string
 	 */
 	public static function encode( $value, $isHtml = false ) {
 		// Some versions of PHP have a broken json_encode, see PHP bug
 		// 46944. Test encoding an affected character (U+20000) to
 		// avoid this.
-		if ( !function_exists( 'json_encode' ) || $isHtml || strtolower( json_encode( "\xf0\xa0\x80\x80" ) ) != '\ud840\udc00' ) {
+		if ( !function_exists( 'json_encode' ) || $isHtml || strtolower( json_encode( "\xf0\xa0\x80\x80" ) ) != '"\ud840\udc00"' ) {
 			$json = new Services_JSON();
 			return $json->encode( $value, $isHtml );
 		} else {
@@ -30,10 +54,10 @@ class FormatJson {
 
 	/**
 	 * Decodes a JSON string.
-	 * 
+	 *
 	 * @param $value String: the json string being decoded.
 	 * @param $assoc Boolean: when true, returned objects will be converted into associative arrays.
-	 * 
+	 *
 	 * @return Mixed: the value encoded in json in appropriate PHP type.
 	 * Values true, false and null (case-insensitive) are returned as true, false
 	 * and &null; respectively. &null; is returned if the json cannot be
@@ -41,15 +65,13 @@ class FormatJson {
 	 */
 	public static function decode( $value, $assoc = false ) {
 		if ( !function_exists( 'json_decode' ) ) {
-			$json = new Services_JSON();
+			$json = $assoc ? new Services_JSON( SERVICES_JSON_LOOSE_TYPE ) :
+				new Services_JSON();
 			$jsonDec = $json->decode( $value );
-			if( $assoc ) {
-				$jsonDec = wfObjectToArray( $jsonDec );
-			}
 			return $jsonDec;
 		} else {
 			return json_decode( $value, $assoc );
 		}
 	}
-	
-}
\ No newline at end of file
+
+}