From f760d8c08f5a61df04cd0f8584e39d2a1b84bb28 Mon Sep 17 00:00:00 2001 From: gicode Date: Sat, 19 Nov 2011 02:53:37 +0000 Subject: [PATCH] Don't force a localization cache rebuild if it will be handled automatically. --- includes/installer/DatabaseUpdater.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php index c8f5b50a2d..50c0c56fa0 100644 --- a/includes/installer/DatabaseUpdater.php +++ b/includes/installer/DatabaseUpdater.php @@ -222,7 +222,7 @@ abstract class DatabaseUpdater { * @param $what Array: what updates to perform */ public function doUpdates( $what = array( 'core', 'extensions', 'purge', 'stats' ) ) { - global $wgVersion; + global $wgLocalisationCacheConf, $wgVersion; $what = array_flip( $what ); if ( isset( $what['core'] ) ) { @@ -235,9 +235,12 @@ abstract class DatabaseUpdater { $this->setAppliedUpdates( $wgVersion, $this->updates ); - if( isset( $what['purge'] ) ) { + if ( isset( $what['purge'] ) ) { $this->purgeCache(); - $this->rebuildLocalisationCache(); + + if ( $wgLocalisationCacheConf['manualRecache'] ) { + $this->rebuildLocalisationCache(); + } } if ( isset( $what['stats'] ) ) { $this->checkStats(); -- 2.20.1