Use __DIR__ instead of dirname( __FILE__ )

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

diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index f846994..7d15959 100644 (file)
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -34,7 +34,7 @@
  * e.g. immobile_namespace for namespaces which can't be moved
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script to move a batch of pages.
@@ -102,7 +102,7 @@ class MoveBatch extends Maintenance {
                        $err = $source->moveTo( $dest, false, $reason );
                        if ( $err !== true ) {
                                $msg = array_shift( $err[0] );
-                               $this->output( "\nFAILED: " . wfMsg( $msg, $err[0] ) );
+                               $this->output( "\nFAILED: " . wfMessage( $msg, $err[0] )->text() );
                        }
                        $dbw->commit( __METHOD__ );
                        $this->output( "\n" );