FU r97978: removed more raw page file cache code

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

diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php
index 1f945d9..14db164 100644 (file)
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -86,10 +86,10 @@ class DeleteBatch extends Maintenance {
                        if ( $page->getNamespace() == NS_FILE ) {
                                $art = new ImagePage( $page );
                                $img = wfFindFile( $art->mTitle );
-                               if ( !$img || !$img->delete( $reason ) ) {
-                                       $this->output( "FAILED to delete image file... " );
-                               } else {
-                                       wfRunHooks('ArticleDeleteComplete', array(&$art, &$wgUser, $reason, $page_id));
+                               if ( !$img
+                                       || !$img->isLocal()
+                                       || !$img->delete( $reason ) ) {
+                                       $this->output( " FAILED to delete image file... " );
                                }
                        } else {
                                $art = new Article( $page );
@@ -97,7 +97,7 @@ class DeleteBatch extends Maintenance {
                        $success = $art->doDeleteArticle( $reason );
                        $dbw->commit();
                        if ( $success ) {
-                               $this->output( "\n" );
+                               $this->output( " Deleted!\n" );
                        } else {
                                $this->output( " FAILED to delete article\n" );
                        }