Merge "mw.rcfilters.ui.MenuSelectWidget: Always open this menu downwards"

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

diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index 3c29689..fa25a06 100644 (file)
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -64,7 +64,7 @@ class MoveBatch extends Maintenance {
                $user = $this->getOption( 'u', false );
                $reason = $this->getOption( 'r', '' );
                $interval = $this->getOption( 'i', 0 );
-               $noredirects = $this->getOption( 'noredirects', false );
+               $noredirects = $this->hasOption( 'noredirects' );
                if ( $this->hasArg() ) {
                        $file = fopen( $this->getArg(), 'r' );
                } else {
@@ -73,7 +73,7 @@ class MoveBatch extends Maintenance {
 
                # Setup
                if ( !$file ) {
-                       $this->error( "Unable to read file, exiting", true );
+                       $this->fatalError( "Unable to read file, exiting" );
                }
                if ( $user === false ) {
                        $wgUser = User::newSystemUser( 'Move page script', [ 'steal' => true ] );
@@ -81,7 +81,7 @@ class MoveBatch extends Maintenance {
                        $wgUser = User::newFromName( $user );
                }
                if ( !$wgUser ) {
-                       $this->error( "Invalid username", true );
+                       $this->fatalError( "Invalid username" );
                }
 
                # Setup complete, now start