* (bug 8380) Be nicer about blank lines in deleteBatch.php

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d1c6177..6ae3e2a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -419,6 +419,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Make variant table caching a little more robust, using main language code
   in cache key. Probably this is still a bit wonky, though. Was breaking
   parser tests when Chinese tables were getting loaded into Serbian code.
+* (bug 8380) Be nicer about blank lines in deleteBatch.php
 
 
 == Languages updated ==

diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php
index 5c5e321..14da6d8 100644 (file)
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -49,8 +49,8 @@ $dbw =& wfGetDB( DB_MASTER );
 
 for ( $linenum = 1; !feof( $file ); $linenum++ ) {
        $line = trim( fgets( $file ) );
-       if ( $line === false ) {
-               break;
+       if ( $line == '' ) {
+               continue;
        }
        $page = Title::newFromText( $line );
        if ( is_null( $page ) ) {