From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 27 Dec 2006 06:10:31 +0000 (+0000)
Subject: * (bug 8380) Be nicer about blank lines in deleteBatch.php
X-Git-Tag: 1.31.0-rc.0~54754
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=1e2c1826bd406a182e468346148a0e6c43a4f671;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d1c6177cae..6ae3e2a4ca 100644
--- 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 5c5e321091..14da6d84e3 100644
--- 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 ) ) {