Use addDescription() instead of accessing mDescription directly

[lhc/web/wiklou.git] / maintenance / cleanupWatchlist.php

diff --git a/maintenance/cleanupWatchlist.php b/maintenance/cleanupWatchlist.php
index 22fd05f..d8c682b 100644 (file)
--- a/maintenance/cleanupWatchlist.php
+++ b/maintenance/cleanupWatchlist.php
@@ -46,7 +46,7 @@ class WatchlistCleanup extends TableCleanup {
 
        public function __construct() {
                parent::__construct();
-               $this->mDescription = "Script to remove broken, unparseable titles in the Watchlist";
+               $this->addDescription( 'Script to remove broken, unparseable titles in the Watchlist' );
                $this->addOption( 'fix', 'Actually remove entries; without will only report.' );
        }
 
@@ -69,6 +69,7 @@ class WatchlistCleanup extends TableCleanup {
                                . "({$row->wl_namespace}, \"{$row->wl_title}\")\n" );
                        $updated = $this->removeWatch( $row );
                        $this->progress( $updated );
+
                        return;
                }
                $this->progress( 0 );
@@ -76,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(
+                       $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__ );
+                               __METHOD__
+                       );
+
                        $this->output( "- removed\n" );
+
                        return 1;
                } else {
                        return 0;