Use local context to get messages

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

diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php
index 15dd7f7..b11a8f3 100644 (file)
--- a/maintenance/cleanupSpam.php
+++ b/maintenance/cleanupSpam.php
@@ -36,6 +36,9 @@ class CleanupSpam extends Maintenance {
 
                $username = wfMsg( 'spambot_username' );
                $wgUser = User::newFromName( $username );
+               if ( !$wgUser ) {
+                       $this->error( "Invalid username", true );
+               }
                // Create the user if necessary
                if ( !$wgUser->getId() ) {
                        $wgUser->addToDatabase();
@@ -45,7 +48,7 @@ class CleanupSpam extends Maintenance {
                if ( !$like ) {
                        $this->error( "Not a valid hostname specification: $spec", true );
                }
-       
+
                if ( $this->hasOption( 'all' ) ) {
                        // Clean up spam on all wikis
                        $this->output( "Finding spam on " . count( $wgLocalDatabases ) . " wikis\n" );
@@ -88,12 +91,12 @@ class CleanupSpam extends Maintenance {
                        $this->error( "Internal error: no page for ID $id" );
                        return;
                }
-       
+
                $this->output( $title->getPrefixedDBkey() . " ..." );
                $rev = Revision::newFromTitle( $title );
                $revId = $rev->getId();
                $currentRevId = $revId;
-       
+
                while ( $rev && LinkFilter::matchEntry( $rev->getText() , $domain ) ) {
                        # Revision::getPrevious can't be used in this way before MW 1.6 (Revision.php 1.26)
                        # $rev = $rev->getPrevious();
@@ -123,10 +126,9 @@ class CleanupSpam extends Maintenance {
                                $article->doEdit( $rev->getText(), wfMsg( 'spam_reverting', $domain ), EDIT_UPDATE );
                        }
                        $dbw->commit();
-                       wfDoUpdates();
                }
        }
 }
 
 $maintClass = "CleanupSpam";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );