From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 13 Sep 2013 17:55:36 +0000 (+0200)
Subject: update.php clears caches twice
X-Git-Tag: 1.31.0-rc.0~18709
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=037d375e0d9ac306f3ef177bbf0fb45d2320df8a;p=lhc%2Fweb%2Fwiklou.git

update.php clears caches twice

There was a bad rebase on I96b4cfd4c02e9cbf46cc6a0499b87fb3b89020a0,
because it partically reverts Ice42a31dee1e6b41da4aa0a47e8786579382aff1

Bug: 44690
Change-Id: Iff2c8d3cb1a10da7cd0ab18ee189454761d7db6f
---

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index f0c5a213bc..d4fe53015f 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -373,7 +373,7 @@ abstract class DatabaseUpdater {
 	 * @param array $what what updates to perform
 	 */
 	public function doUpdates( $what = array( 'core', 'extensions', 'stats' ) ) {
-		global $wgVersion, $wgLocalisationCacheConf;
+		global $wgVersion;
 
 		$this->db->begin( __METHOD__ );
 		$what = array_flip( $what );
@@ -390,14 +390,6 @@ abstract class DatabaseUpdater {
 			$this->checkStats();
 		}
 
-		if ( isset( $what['purge'] ) ) {
-			$this->purgeCache();
-
-			if ( $wgLocalisationCacheConf['manualRecache'] ) {
-				$this->rebuildLocalisationCache();
-			}
-		}
-
 		$this->setAppliedUpdates( $wgVersion, $this->updates );
 
 		if ( $this->fileHandle ) {
diff --git a/maintenance/update.php b/maintenance/update.php
index 5df9f32ad3..378217fd0b 100644
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -140,10 +140,6 @@ class UpdateMediaWiki extends Maintenance {
 				$updates[] = 'noschema';
 			}
 			$updates[] = 'stats';
-
-			if ( !$this->hasOption( 'nopurge' ) ) {
-				$updates[] = 'purge';
-			}
 		}
 
 		$updater = DatabaseUpdater::newForDb( $db, $shared, $this );