diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2014-12-27 15:41:37 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2014-12-31 11:43:28 +0100 |
| commit | c1f9b1f7b1b77776192048005dcc66dcf3df2bfb (patch) | |
| tree | 2b38796e738dd74cb42ecd9bfd151803108386bc /maintenance/cleanupWatchlist.php | |
| parent | b88ab0086858470dd1f644e64cb4e4f62bb2be9b (diff) | |
Update to MediaWiki 1.24.1
Diffstat (limited to 'maintenance/cleanupWatchlist.php')
| -rw-r--r-- | maintenance/cleanupWatchlist.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/maintenance/cleanupWatchlist.php b/maintenance/cleanupWatchlist.php index f1a7b481..eb7d7b18 100644 --- a/maintenance/cleanupWatchlist.php +++ b/maintenance/cleanupWatchlist.php @@ -7,7 +7,7 @@ * --fix Actually remove entries; without will only report. * * Copyright © 2005,2006 Brion Vibber <brion@pobox.com> - * http://www.mediawiki.org/ + * https://www.mediawiki.org/ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -65,9 +65,11 @@ class WatchlistCleanup extends TableCleanup { $title = Title::newFromText( $verified ); if ( $row->wl_user == 0 || is_null( $title ) || !$title->equals( $current ) ) { - $this->output( "invalid watch by {$row->wl_user} for ({$row->wl_namespace}, \"{$row->wl_title}\")\n" ); + $this->output( "invalid watch by {$row->wl_user} for " + . "({$row->wl_namespace}, \"{$row->wl_title}\")\n" ); $updated = $this->removeWatch( $row ); $this->progress( $updated ); + return; } $this->progress( 0 ); @@ -76,12 +78,16 @@ class WatchlistCleanup extends TableCleanup { private function removeWatch( $row ) { if ( !$this->dryrun && $this->hasOption( 'fix' ) ) { $dbw = wfGetDB( DB_MASTER ); - $dbw->delete( 'watchlist', array( + $dbw->delete( + 'watchlist', array( 'wl_user' => $row->wl_user, 'wl_namespace' => $row->wl_namespace, 'wl_title' => $row->wl_title ), - __METHOD__ ); + __METHOD__ + ); + $this->output( "- removed\n" ); + return 1; } else { return 0; |