| Index: branches/resourceloader/phase3/includes/CSSJanus.php |
| — | — | @@ -123,7 +123,7 @@ |
| 124 | 124 | * @param bool $swapLeftRightInURL If true, swap 'left' and 'right' in URLs |
| 125 | 125 | * @return Transformed stylesheet |
| 126 | 126 | */ |
| 127 | | - public function transform( $css, $swapLtrRtlInURL = false, $swapLeftRightInURL = false ) { |
| | 127 | + public static function transform( $css, $swapLtrRtlInURL = false, $swapLeftRightInURL = false ) { |
| 128 | 128 | // We wrap tokens in ` , not ~ like the original implementation does. |
| 129 | 129 | // This was done because ` is not a legal character in CSS and can only |
| 130 | 130 | // occur in URLs, where we escape it to %60 before inserting our tokens. |
| Index: branches/resourceloader/phase3/load.php |
| — | — | @@ -21,13 +21,14 @@ |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | 24 | /** |
| | 25 | + * @file |
| 25 | 26 | * This file is the entry point for the resource loader. |
| 26 | 27 | */ |
| 27 | 28 | |
| 28 | 29 | // TODO: Caching + easy 304s before WebStart |
| 29 | 30 | |
| 30 | 31 | require ( dirname( __FILE__ ) . '/includes/WebStart.php' ); |
| 31 | | -wfProfileIn( 'loader.php' ); |
| | 32 | +wfProfileIn( 'load.php' ); |
| 32 | 33 | |
| 33 | 34 | // URL safety checks |
| 34 | 35 | // |
| — | — | @@ -51,7 +52,7 @@ |
| 52 | 53 | // Respond to resource loading request |
| 53 | 54 | ResourceLoader::respond( $wgRequest ); |
| 54 | 55 | |
| 55 | | -wfProfileOut( 'loader.php' ); |
| | 56 | +wfProfileOut( 'load.php' ); |
| 56 | 57 | wfLogProfilingData(); |
| 57 | 58 | |
| 58 | 59 | // Shut down the database |