Merge "Rewrite pref cleanup script"

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

diff --git a/maintenance/cleanupSpam.php b/maintenance/cleanupSpam.php
index fc3cc5b..038b28c 100644 (file)
--- a/maintenance/cleanupSpam.php
+++ b/maintenance/cleanupSpam.php
@@ -47,7 +47,7 @@ class CleanupSpam extends Maintenance {
                $username = wfMessage( 'spambot_username' )->text();
                $wgUser = User::newSystemUser( $username );
                if ( !$wgUser ) {
-                       $this->error( "Invalid username specified in 'spambot_username' message: $username", true );
+                       $this->fatalError( "Invalid username specified in 'spambot_username' message: $username" );
                }
                // Hack: Grant bot rights so we don't flood RecentChanges
                $wgUser->addGroup( 'bot' );
@@ -55,7 +55,7 @@ class CleanupSpam extends Maintenance {
                $spec = $this->getArg();
                $like = LinkFilter::makeLikeArray( $spec );
                if ( !$like ) {
-                       $this->error( "Not a valid hostname specification: $spec", true );
+                       $this->fatalError( "Not a valid hostname specification: $spec" );
                }
 
                if ( $this->hasOption( 'all' ) ) {
@@ -156,5 +156,5 @@ class CleanupSpam extends Maintenance {
        }
 }
 
-$maintClass = "CleanupSpam";
+$maintClass = CleanupSpam::class;
 require_once RUN_MAINTENANCE_IF_MAIN;