| Index: branches/resourceloader/phase3/includes/ResourceLoader.php |
| — | — | @@ -54,6 +54,7 @@ |
| 55 | 55 | 'bar' => array( |
| 56 | 56 | 'script' => 'resources/test/bar.js', |
| 57 | 57 | 'loader' => 'resources/test/loader.js', |
| | 58 | + 'style' => 'resources/test/bar.css', |
| 58 | 59 | ), |
| 59 | 60 | 'buz' => array( |
| 60 | 61 | 'script' => 'resources/test/baz.js', |
| — | — | @@ -204,7 +205,7 @@ |
| 205 | 206 | global $wgMemc; |
| 206 | 207 | $key = wfMemcKey( 'resourceloader', 'cssmin', md5( $css ) ); |
| 207 | 208 | $cached = $wgMemc->get( $key ); |
| 208 | | - if( $cached !== false ) { |
| | 209 | + if( $cached !== false && $cached !== null ) { |
| 209 | 210 | return $cached; |
| 210 | 211 | } |
| 211 | 212 | // TODO: Test how well this path rewriting stuff works with various setups |
| — | — | @@ -217,7 +218,7 @@ |
| 218 | 219 | global $wgMemc; |
| 219 | 220 | $key = wfMemcKey( 'resourceloader', 'cssjanus', md5( $css ) ); |
| 220 | 221 | $cached = $wgMemc->get( $key ); |
| 221 | | - if ( $cached !== false ) { |
| | 222 | + if ( $cached !== false && $cached !== null ) { |
| 222 | 223 | return $cached; |
| 223 | 224 | } |
| 224 | 225 | $retval = $css; // TODO: Actually flip |