Back out unreviewed commit 17d23282dd6d8b1bf6b1b80f97cf02265cbec59d

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

diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php
index 812b28d..8963ae1 100644 (file)
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -89,7 +89,7 @@ class DeleteBatch extends Maintenance {
                        }
 
                        $this->output( $title->getPrefixedText() );
-                       $dbw->begin();
+                       $dbw->begin( __METHOD__ );
                        if ( $title->getNamespace() == NS_FILE ) {
                                $img = wfFindFile( $title );
                                if ( $img && $img->isLocal() && !$img->delete( $reason ) ) {
@@ -98,8 +98,8 @@ class DeleteBatch extends Maintenance {
                        }
                        $page = WikiPage::factory( $title );
                        $error = '';
-                       $success = $page->doDeleteArticle( $reason, false, 0, true, $error, $user );
-                       $dbw->commit();
+                       $success = $page->doDeleteArticle( $reason, false, 0, false, $error, $user );
+                       $dbw->commit( __METHOD__ );
                        if ( $success ) {
                                $this->output( " Deleted!\n" );
                        } else {