follow-up r60272. replace $_GET with $wgRequest->getText.

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

diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php
index 5fc7435..56afd86 100644 (file)
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -27,7 +27,7 @@
  * @ingroup Maintenance
  */
  
-require_once( "Maintenance.php" );
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
 class DeleteBatch extends Maintenance {
        
@@ -37,7 +37,7 @@ class DeleteBatch extends Maintenance {
                $this->addOption( 'u', "User to perform deletion", false, true );
                $this->addOption( 'r', "Reason to delete page", false, true );
                $this->addOption( 'i', "Interval to sleep between deletions" );
-               $this->addArgs( array( 'listfile' ) );
+               $this->addArg( 'listfile', 'File with titles to delete, separated by newlines', false );
        }
        
        public function execute() {
@@ -59,7 +59,7 @@ class DeleteBatch extends Maintenance {
 
                # Setup
                if( !$file ) {
-                       $this->error( "Unable to read file, exiting\n", true );
+                       $this->error( "Unable to read file, exiting", true );
                }
                $wgUser = User::newFromName( $user );
                $dbw = wfGetDB( DB_MASTER );
@@ -93,7 +93,7 @@ class DeleteBatch extends Maintenance {
                                $art = new Article( $page );
                        }
                        $success = $art->doDeleteArticle( $reason );
-                       $dbw->immediateCommit();
+                       $dbw->commit();
                        if ( $success ) {
                                $this->output( "\n" );
                        } else {