From: Jack Phoenix <ashley@users.mediawiki.org>
Date: Sat, 15 May 2010 10:39:41 +0000 (+0000)
Subject: coding style tweaks
X-Git-Tag: 1.31.0-rc.0~36847
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/modifier.php?a=commitdiff_plain;h=4bc6efd5bec0b770a60e5663fcbef6a5fb25f058;hp=bcee7c223859d57d643de628494b371d55d408a6;p=lhc%2Fweb%2Fwiklou.git

coding style tweaks
---

diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index 9a1f57fd88..cacf6680fc 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -1,29 +1,31 @@
 <?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
  */
-if( !(defined( 'MEDIAWIKI' ) ) ) {
+if ( !defined( 'MEDIAWIKI' ) ) {
 	die( 1 );
 }
 
 class FormatJson {
-	public static function encode($value, $isHtml=false){
+	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) ;
+			return $json->encode( $value, $isHtml );
 		} else {
-			return json_encode($value);
+			return json_encode( $value );
 		}
 	}
-	public static function decode( $value, $assoc=false ){
-		if (!function_exists('json_decode') ) {
+
+	public static function decode( $value, $assoc = false ) {
+		if ( !function_exists( 'json_decode' ) ) {
 			$json = new Services_JSON();
 			$jsonDec = $json->decode( $value );
-			if( $assoc )
+			if( $assoc ) {
 				$jsonDec = wfObjectToArray( $jsonDec );
+			}
 			return $jsonDec;
 		} else {
 			return json_decode( $value, $assoc );