Remove $wgUseDataURLs as promised by the comment in DefaultSettings.php . Data URL...

[lhc/web/wiklou.git] / includes / ResourceLoaderModule.php

diff --git a/includes/ResourceLoaderModule.php b/includes/ResourceLoaderModule.php
index a87f83a..bda0795 100644 (file)
--- a/includes/ResourceLoaderModule.php
+++ b/includes/ResourceLoaderModule.php
@@ -728,12 +728,12 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
         * @return string Remapped CSS
         */
        protected static function remapStyle( $file ) {
-               global $wgUseDataURLs, $wgScriptPath;
+               global $wgScriptPath;
                return CSSMin::remap(
                        file_get_contents( self::remapFilename( $file ) ),
                        dirname( $file ),
                        $wgScriptPath . '/' . dirname( $file ),
-                       $wgUseDataURLs
+                       true
                );
        }
 }
@@ -1123,11 +1123,11 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
                        // Startup function
                        $configuration = FormatJson::encode( $this->getConfig( $context ) );
                        $registrations = self::getModuleRegistrations( $context );
-                       $out .= "window.startUp = function() {\n\t$registrations\n\tmediaWiki.config.set( $configuration );\n};";
+                       $out .= "var startUp = function() {\n\t$registrations\n\tmediaWiki.config.set( $configuration );\n};";
                        
                        // Conditional script injection
                        $scriptTag = Xml::escapeJsString( Html::linkedScript( $wgLoadScript . '?' . wfArrayToCGI( $query ) ) );
-                       $out .= "if ( isCompatible() ) {\n\tdocument.write( '$scriptTag' );\n}\ndelete window['isCompatible'];";
+                       $out .= "if ( isCompatible() ) {\n\tdocument.write( '$scriptTag' );\n}\ndelete isCompatible;";
                }
 
                return $out;