Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 6 insertions, 4 deletions

diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php
index c8bb4803..eb2e1f34 100644
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -87,8 +87,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... " );
+				if ( !$img
+					|| !$img->isLocal()
+					|| !$img->delete( $reason ) ) {
+					$this->output( " FAILED to delete image file... " );
 				}
 			} else {
 				$art = new Article( $page );
@@ -96,7 +98,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" );
 			}
@@ -104,7 +106,7 @@ class DeleteBatch extends Maintenance {
 			if ( $interval ) {
 				sleep( $interval );
 			}
-			wfWaitForSlaves( 5 );
+			wfWaitForSlaves();
 }
 	}
 }