r80719 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r80718‎ | r80719 | r80720 >
Date:22:44, 21 January 2011
Author:platonides
Status:ok
Tags:
Comment:
Move $wgLocalisationCacheConf disabling from bootstrap.php to phpunit.php
Modified paths:
  • /trunk/phase3/tests/phpunit/bootstrap.php (modified) (history)
  • /trunk/phase3/tests/phpunit/phpunit.php (modified) (history)

Diff [purge]

Index: trunk/phase3/tests/phpunit/bootstrap.php
@@ -28,9 +28,8 @@
2929 EOF;
3030 }
3131
32 -global $wgLocalisationCacheConf, $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
 32+global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
3333 global $wgMessageCache, $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgMemc;
34 -$wgLocalisationCacheConf['storeClass'] = 'LCStore_Null';
3534 $wgMainCacheType = CACHE_NONE;
3635 $wgMessageCacheType = CACHE_NONE;
3736 $wgParserCacheType = CACHE_NONE;
Index: trunk/phase3/tests/phpunit/phpunit.php
@@ -20,6 +20,8 @@
2121 // Assume UTC for testing purposes
2222 $wgLocaltimezone = 'UTC';
2323
 24+$wgLocalisationCacheConf['storeClass'] = 'LCStore_Null';
 25+
2426 if( !in_array( '--configuration', $_SERVER['argv'] ) ) {
2527 //Hack to eliminate the need to use the Makefile (which sucks ATM)
2628 $_SERVER['argv'][] = '--configuration';

Status & tagging log