From 71ee20cd18109164bd96ff8f061ed4850fb33d7f Mon Sep 17 00:00:00 2001 From: Platonides Date: Fri, 21 Jan 2011 22:44:40 +0000 Subject: [PATCH] Move $wgLocalisationCacheConf disabling from bootstrap.php to phpunit.php --- tests/phpunit/bootstrap.php | 3 +-- tests/phpunit/phpunit.php | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php index 101418fe51..46d2534520 100644 --- a/tests/phpunit/bootstrap.php +++ b/tests/phpunit/bootstrap.php @@ -28,9 +28,8 @@ dependencies. EOF; } -global $wgLocalisationCacheConf, $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType; +global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType; global $wgMessageCache, $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgMemc; -$wgLocalisationCacheConf['storeClass'] = 'LCStore_Null'; $wgMainCacheType = CACHE_NONE; $wgMessageCacheType = CACHE_NONE; $wgParserCacheType = CACHE_NONE; diff --git a/tests/phpunit/phpunit.php b/tests/phpunit/phpunit.php index e89c442981..d196c1a9f6 100755 --- a/tests/phpunit/phpunit.php +++ b/tests/phpunit/phpunit.php @@ -20,6 +20,8 @@ require_once( "$IP/maintenance/commandLine.inc" ); // Assume UTC for testing purposes $wgLocaltimezone = 'UTC'; +$wgLocalisationCacheConf['storeClass'] = 'LCStore_Null'; + if( !in_array( '--configuration', $_SERVER['argv'] ) ) { //Hack to eliminate the need to use the Makefile (which sucks ATM) $_SERVER['argv'][] = '--configuration'; -- 2.20.1