jenkins-bot has submitted this change and it was merged.
Change subject: update.php clears caches twice
......................................................................
update.php clears caches twice
There was a bad rebase on I96b4cfd4c02e9cbf46cc6a0499b87fb3b89020a0,
because it partically reverts Ice42a31dee1e6b41da4aa0a47e8786579382aff1
Bug: 44690
Change-Id: Iff2c8d3cb1a10da7cd0ab18ee189454761d7db6f
---
M includes/installer/DatabaseUpdater.php
M maintenance/update.php
2 files changed, 1 insertion(+), 13 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/installer/DatabaseUpdater.php
b/includes/installer/DatabaseUpdater.php
index f0c5a21..d4fe530 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -373,7 +373,7 @@
* @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 );
@@ -388,14 +388,6 @@
if ( isset( $what['stats'] ) ) {
$this->checkStats();
- }
-
- if ( isset( $what['purge'] ) ) {
- $this->purgeCache();
-
- if ( $wgLocalisationCacheConf['manualRecache'] ) {
- $this->rebuildLocalisationCache();
- }
}
$this->setAppliedUpdates( $wgVersion, $this->updates );
diff --git a/maintenance/update.php b/maintenance/update.php
index 5df9f32..378217f 100644
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -140,10 +140,6 @@
$updates[] = 'noschema';
}
$updates[] = 'stats';
-
- if ( !$this->hasOption( 'nopurge' ) ) {
- $updates[] = 'purge';
- }
}
$updater = DatabaseUpdater::newForDb( $db, $shared, $this );
--
To view, visit https://gerrit.wikimedia.org/r/84137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff2c8d3cb1a10da7cd0ab18ee189454761d7db6f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: MarkAHershberger <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
