From fafcd0d031a96290873c43c06c6e38a3fe4e0267 Mon Sep 17 00:00:00 2001 From: Trevor Parscal Date: Tue, 12 Oct 2010 17:52:32 +0000 Subject: [PATCH] Simplifies r73680 by letting FormatJson::encode do it's magic with handling null and string values correctly. --- includes/ResourceLoader.php | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) 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"; } } -- 2.20.1