| Index: trunk/extensions/JS2Support/mwEmbed/includes/NamedResourceLoader.php |
| — | — | @@ -17,7 +17,7 @@ |
| 18 | 18 | private static $combinedLoadersJs = ''; |
| 19 | 19 | |
| 20 | 20 | // Reg Exp that supports extracting classes from loaders |
| 21 | | - private static $classReplaceExp = '/mw\.addResourcePaths\s*\(\s*{(.*)}\s*\)\s*\;/siU'; |
| | 21 | + private static $classReplaceExp = '/mw\.addResourcePaths\s*\(\s*{(.*)}\s*\)\s*[\;\n]/siU'; |
| 22 | 22 | |
| 23 | 23 | // Flag to specify if the javascript resource paths have been loaded. |
| 24 | 24 | private static $classesLoaded = false; |
| — | — | @@ -265,11 +265,7 @@ |
| 266 | 266 | $jClassSet = FormatJson::decode( '{' . $jsvar[1] . '}', true ); |
| 267 | 267 | // Check for null json decode: |
| 268 | 268 | if( $jClassSet == NULL ){ |
| 269 | | - $moduleName = ( self::$resourceParentModuleName [ $resourceName ] ) |
| 270 | | - ? self::$resourceParentModuleName [ $resourceName ] |
| 271 | | - : ' loader set in extension '; |
| 272 | | - |
| 273 | | - throw new MWException( "Error could not decode javascript resource list for module:" . $moduleName ." \n" ); |
| | 269 | + throw new MWException( "Error could not decode javascript resource list for module: " + self::$currentModuleName + "\n" ); |
| 274 | 270 | return false; |
| 275 | 271 | } |
| 276 | 272 | |
| Index: trunk/extensions/JS2Support/mwEmbed/includes/noMediaWikiConfig.php |
| — | — | @@ -28,7 +28,7 @@ |
| 29 | 29 | $wgUseFileCache = true; |
| 30 | 30 | |
| 31 | 31 | // Named paths for the script loader |
| 32 | | -$wgScriptLoaderNamedPaths = array(); |
| | 32 | +$wgResourceLoaderNamedPaths = array(); |
| 33 | 33 | |
| 34 | 34 | //If the scriptLoader should use relative css |
| 35 | 35 | $wgScriptLoaderRelativeCss = false; |