X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2FMessageBlobStore.php;h=e3b4dbe8fed47123b7935f1902b28382b22886e5;hb=3bf46cc4eae7fe8833a27779e6aa77fff9623871;hp=30d4fdab752f83c4893191183a1b582bb99c79b2;hpb=26bef0e5bfd518b5f7148db8869b56886e7bff7f;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/MessageBlobStore.php b/includes/MessageBlobStore.php index 30d4fdab75..e3b4dbe8fe 100644 --- a/includes/MessageBlobStore.php +++ b/includes/MessageBlobStore.php @@ -345,8 +345,7 @@ class MessageBlobStore { * @return array Array mapping module names to blobs */ private function getFromDB( ResourceLoader $resourceLoader, $modules, $lang ) { - global $wgCacheEpoch; - + $config = $resourceLoader->getConfig(); $retval = array(); $dbr = wfGetDB( DB_SLAVE ); $res = $dbr->select( 'msg_resource', @@ -363,11 +362,11 @@ class MessageBlobStore { } // Update the module's blobs if the set of messages changed or if the blob is - // older than $wgCacheEpoch + // older than the CacheEpoch setting $keys = array_keys( FormatJson::decode( $row->mr_blob, true ) ); $values = array_values( array_unique( $module->getMessages() ) ); if ( $keys !== $values - || wfTimestamp( TS_MW, $row->mr_timestamp ) <= $wgCacheEpoch + || wfTimestamp( TS_MW, $row->mr_timestamp ) <= $config->get( 'CacheEpoch' ) ) { $retval[$row->mr_resource] = $this->updateModule( $row->mr_resource, $module, $lang ); } else {