From: Ariel Glenn <ariel@users.mediawiki.org>
Date: Tue, 23 Aug 2011 00:04:45 +0000 (+0000)
Subject: fix a couple bad lines in previous commit from bad merge attempt
X-Git-Tag: 1.31.0-rc.0~28128
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=b6a6354676cf945beca9e8cd89982af631a8df83;p=lhc%2Fweb%2Fwiklou.git

fix a couple bad lines in previous commit from bad merge attempt
---

diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index 1e3d6cac78..0ece9713f3 100644
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -222,7 +222,6 @@ class TextPassDumper extends BackupDumper {
 			$this->progress( sprintf( "%s: %s (ID %d) %d pages (%0.1f|%0.1f/sec all|curr), %d revs (%0.1f|%0.1f/sec all|curr), %0.1f%%|%0.1f%% prefetched (all|curr), ETA %s [max %d]",-
 					$now, wfWikiID(), $this->ID, $this->pageCount, $pageRate, $pageRatePart, $this->revCount, $revRate, $revRatePart, $fetchRate, $fetchRatePart, $etats, $this->maxCount ) );
 			$this->lastTime = $now;
-			$this->partCountLast = $this->partCount;
 			$this->revCountLast = $this->revCount;
 			$this->prefetchCountLast = $this->prefetchCount;
 			$this->fetchCountLast = $this->fetchCount;
@@ -248,8 +247,7 @@ class TextPassDumper extends BackupDumper {
 		foreach ($this->checkpointFiles as $checkpointFile) {
 			$count = substr_count ($checkpointFile,"%s");
 			if (substr_count ($checkpointFile,"%s") != 2) {
-				wfDie("Option checkpointfile must contain two '%s' for substitution of first and last pageids, count is $count instead, fil
-e is $checkpointFile.\n");
+				wfDie("Option checkpointfile must contain two '%s' for substitution of first and last pageids, count is $count instead, file is $checkpointFile.\n");
 			}
 		}