| Index: trunk/phase3/includes/ResourceLoader.php |
| — | — | @@ -275,7 +275,7 @@ |
| 276 | 276 | // To send Last-Modified and support If-Modified-Since, we need to detect |
| 277 | 277 | // the last modified time |
| 278 | 278 | wfProfileIn( __METHOD__.'-getModifiedTime' ); |
| 279 | | - $mtime = $wgCacheEpoch; |
| | 279 | + $mtime = wfTimestamp( TS_UNIX, $wgCacheEpoch ); |
| 280 | 280 | foreach ( $modules as $module ) { |
| 281 | 281 | // Bypass squid cache if the request includes any private modules |
| 282 | 282 | if ( $module->getGroup() === 'private' ) { |
| Index: trunk/phase3/includes/ResourceLoaderModule.php |
| — | — | @@ -1073,7 +1073,7 @@ |
| 1074 | 1074 | } |
| 1075 | 1075 | // Automatically register module |
| 1076 | 1076 | else { |
| 1077 | | - $mtime = max( $module->getModifiedTime( $context ), $wgCacheEpoch ); |
| | 1077 | + $mtime = max( $module->getModifiedTime( $context ), wfTimestamp( TS_UNIX, $wgCacheEpoch ) ); |
| 1078 | 1078 | // Modules without dependencies or a group pass two arguments (name, timestamp) to |
| 1079 | 1079 | // mediaWiki.loader.register() |
| 1080 | 1080 | if ( !count( $module->getDependencies() && $module->getGroup() === null ) ) { |
| — | — | @@ -1145,7 +1145,7 @@ |
| 1146 | 1146 | |
| 1147 | 1147 | // ATTENTION!: Because of the line above, this is not going to cause infinite recursion - think carefully |
| 1148 | 1148 | // before making changes to this code! |
| 1149 | | - $time = $wgCacheEpoch; |
| | 1149 | + $time = wfTimestamp( TS_UNIX, $wgCacheEpoch ); |
| 1150 | 1150 | foreach ( $context->getResourceLoader()->getModules() as $module ) { |
| 1151 | 1151 | $time = max( $time, $module->getModifiedTime( $context ) ); |
| 1152 | 1152 | } |