| Index: branches/wmf/1.17wmf1/includes/OutputPage.php |
| — | — | @@ -2415,7 +2415,7 @@ |
| 2416 | 2416 | $timestamp = max( $timestamp, $module->getModifiedTime( $context ) ); |
| 2417 | 2417 | } |
| 2418 | 2418 | // Add a version parameter so cache will break when things change |
| 2419 | | - $query['version'] = wfTimestamp( TS_ISO_8601_BASIC, round( $timestamp, -2 ) ); |
| | 2419 | + $query['version'] = wfTimestamp( TS_ISO_8601_BASIC, $timestamp ); |
| 2420 | 2420 | } |
| 2421 | 2421 | // Make queries uniform in order |
| 2422 | 2422 | ksort( $query ); |
| Property changes on: branches/wmf/1.17wmf1/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2423 | 2423 | Merged /trunk/phase3/includes/OutputPage.php:r82219 |
| Index: branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderStartUpModule.php |
| — | — | @@ -33,7 +33,7 @@ |
| 34 | 34 | $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, |
| 35 | 35 | $wgVariantArticlePath, $wgActionPaths, $wgUseAjax, $wgVersion, |
| 36 | 36 | $wgEnableAPI, $wgEnableWriteAPI, $wgDBname, $wgEnableMWSuggest, |
| 37 | | - $wgSitename, $wgFileExtensions; |
| | 37 | + $wgSitename, $wgFileExtensions, $wgExtensionAssetsPath; |
| 38 | 38 | |
| 39 | 39 | // Pre-process information |
| 40 | 40 | $separatorTransTable = $wgContLang->separatorTransformTable(); |
| — | — | @@ -77,6 +77,7 @@ |
| 78 | 78 | 'wgSiteName' => $wgSitename, |
| 79 | 79 | 'wgFileExtensions' => array_values( $wgFileExtensions ), |
| 80 | 80 | 'wgDBname' => $wgDBname, |
| | 81 | + 'wgExtensionAssetsPath' => $wgExtensionAssetsPath, |
| 81 | 82 | ); |
| 82 | 83 | if ( $wgContLang->hasVariants() ) { |
| 83 | 84 | $vars['wgUserVariant'] = $wgContLang->getPreferredVariant(); |