resourceloader: Fix undefined variable in ResourceLoaderFileModule::getSkipFunction
authorAlexandre Emsenhuber <mediawiki@emsenhuber.ch>
Tue, 12 Aug 2014 18:15:53 +0000 (20:15 +0200)
committerKrinkle <krinklemail@gmail.com>
Tue, 12 Aug 2014 22:25:20 +0000 (22:25 +0000)
Follows-up 75c08916b02ac87. Looking at the call chain of
validateScriptFile() up to JSTokenzier, the first parameter is the file
name, otherwise "[inline]" is used; so that variable should be $localPath.

Bug: 69214
Change-Id: If7f36449cb352f50ba795a6d306e5d949a3dbd29

includes/resourceloader/ResourceLoaderFileModule.php

index f646ae9..06f7146 100644 (file)
@@ -479,7 +479,7 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
                }
                $contents = file_get_contents( $localPath );
                if ( $this->getConfig()->get( 'ResourceLoaderValidateStaticJS' ) ) {
-                       $contents = $this->validateScriptFile( $fileName, $contents );
+                       $contents = $this->validateScriptFile( $localPath, $contents );
                }
                return $contents;
        }