| Index: branches/js2-work/phase3/includes/OutputPage.php |
| — | — | @@ -218,7 +218,7 @@ |
| 219 | 219 | global $wgDebugJavaScript, $wgJSAutoloadClasses, $IP, |
| 220 | 220 | $wgEnableScriptLoader, $wgStyleVersion, $wgScriptPath, $wgStylePath; |
| 221 | 221 | |
| 222 | | - $path = jsScriptLoader::getJsPathFromClass( $jsClass ); |
| | 222 | + $path = jsScriptLoader::getPathFromClass( $jsClass ); |
| 223 | 223 | |
| 224 | 224 | if( $path !== false ){ |
| 225 | 225 | if( $wgEnableScriptLoader ) { |
| — | — | @@ -312,7 +312,7 @@ |
| 313 | 313 | }else{ |
| 314 | 314 | // Check for file modified time: |
| 315 | 315 | if( $wgScriptModifiedFileCheck ) { |
| 316 | | - $jsPath = jsScriptLoader::getJsPathFromClass( $class ); |
| | 316 | + $jsPath = jsScriptLoader::getPathFromClass( $class ); |
| 317 | 317 | if( $jsPath ) { |
| 318 | 318 | $cur_ftime = filemtime ( $IP ."/". $jsPath ); |
| 319 | 319 | if( $cur_ftime > $ftime ) |
| Index: branches/js2-work/phase3/js/mwEmbed/jsScriptLoader.php |
| — | — | @@ -518,7 +518,7 @@ |
| 519 | 519 | $reqClass = preg_replace( "/[^A-Za-z0-9_\-\.]/", '', $reqClass ); |
| 520 | 520 | |
| 521 | 521 | $filePath = self::getPathFromClass( $reqClass ); |
| 522 | | - if( !$jsFilePath ){ |
| | 522 | + if( !$filePath ){ |
| 523 | 523 | $this->errorMsg .= 'Requested class: ' . htmlspecialchars( $reqClass ) . ' not found' . "\n"; |
| 524 | 524 | }else{ |
| 525 | 525 | $this->jsFileList[ $reqClass ] = $filePath; |