Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MessageBlobStore: Use Config instead of globals

Browse source 
Change-Id: I458cc74bac1bff8edab6ad537a3a999ede5706ed
This commit is contained in:
Kunal Mehta 2014-08-23 00:58:07 -07:00 committed by Krinkle
parent bb03d1a8e0
commit 4e94a67445
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
includes/MessageBlobStore.php
View file

@ -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 {