From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Tue, 12 Oct 2010 17:52:32 +0000 (+0000)
Subject: Simplifies r73680 by letting FormatJson::encode do it's magic with handling null... 
X-Git-Tag: 1.31.0-rc.0~34536
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=fafcd0d031a96290873c43c06c6e38a3fe4e0267;p=lhc%2Fweb%2Fwiklou.git

Simplifies r73680 by letting FormatJson::encode do it's magic with handling null and string values correctly.
---

diff --git a/includes/ResourceLoader.php b/includes/ResourceLoader.php
index be66454bdf..5cdf9cb15d 100644
--- a/includes/ResourceLoader.php
+++ b/includes/ResourceLoader.php
@@ -430,18 +430,8 @@ class ResourceLoader {
 	public static function makeCustomLoaderScript( $name, $version, $dependencies, $group, $script ) {
 		$name = Xml::escapeJsString( $name );
 		$version = (int) $version > 1 ? (int) $version : 1;
-		if ( is_array( $dependencies ) ) {
-			$dependencies = FormatJson::encode( $dependencies );
-		} else if ( is_string( $dependencies ) ) {
-			$dependencies = "'" . Xml::escapeJsString( $dependencies ) . "'";
-		} else {
-			$dependencies = 'null';
-		}
-		if ( is_string( $group ) ) {
-			$group = "'" . Xml::escapeJsString( $group ) . "'";
-		} else {
-			$group = 'null';
-		}
+		$dependencies = FormatJson::encode( $dependencies );
+		$group = FormatJson::encode( $group );
 		$script = str_replace( "\n", "\n\t", trim( $script ) );
 		return "( function( name, version, dependencies, group ) {\n\t$script\n} )" .
 			"( '$name', $version, $dependencies, $group );\n";
@@ -454,18 +444,8 @@ class ResourceLoader {
 		} else {
 			$name = Xml::escapeJsString( $name );
 			$version = (int) $version > 1 ? (int) $version : 1;
-			if ( is_array( $dependencies ) ) {
-				$dependencies = FormatJson::encode( $dependencies );
-			} else if ( is_string( $dependencies ) ) {
-				$dependencies = "'" . Xml::escapeJsString( $dependencies ) . "'";
-			} else {
-				$dependencies = 'null';
-			}
-			if ( is_string( $group ) ) {
-				$group = "'" . Xml::escapeJsString( $group ) . "'";
-			} else {
-				$group = 'null';
-			}
+			$dependencies = FormatJson::encode( $dependencies );
+			$group = FormatJson::encode( $group );
 			return "mediaWiki.loader.register( '$name', $version, $dependencies, $group );\n";
 		}
 	}