X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcleanupWatchlist.php;h=f1a7b481ac161534d2392f5540bf8990e25e492a;hb=052770c40b84e22ddd42ff5686e0aaf3b9131030;hp=fbab6a3c4f68f0f4fbdc5eeec90c9eb8e3fbff6c;hpb=40edd09eb94a05e768eb4ec3fba482a7ddbe39cc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupWatchlist.php b/maintenance/cleanupWatchlist.php
index fbab6a3c4f..16f7b616de 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
@@ -29,7 +29,7 @@
  * @ingroup Maintenance
  */
 
-require_once( __DIR__ . '/cleanupTable.inc' );
+require_once __DIR__ . '/cleanupTable.inc';
 
 /**
  * Maintenance script to remove broken, unparseable titles in the watchlist table.
@@ -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 );
@@ -75,13 +77,17 @@ class WatchlistCleanup extends TableCleanup {
 
 	private function removeWatch( $row ) {
 		if ( !$this->dryrun && $this->hasOption( 'fix' ) ) {
-			$dbw = wfGetDB( DB_MASTER );
-			$dbw->delete( 'watchlist', array(
-				'wl_user'      => $row->wl_user,
+			$dbw = $this->getDB( DB_MASTER );
+			$dbw->delete(
+				'watchlist', array(
+				'wl_user' => $row->wl_user,
 				'wl_namespace' => $row->wl_namespace,
-				'wl_title'     => $row->wl_title ),
-			__METHOD__ );
+				'wl_title' => $row->wl_title ),
+				__METHOD__
+			);
+
 			$this->output( "- removed\n" );
+
 			return 1;
 		} else {
 			return 0;
@@ -90,4 +96,4 @@ class WatchlistCleanup extends TableCleanup {
 }
 
 $maintClass = "WatchlistCleanup";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;