From 76997163b63a1b37d8621f6729ca43b5f2be0560 Mon Sep 17 00:00:00 2001
From: Ariel Glenn <ariel@users.mediawiki.org>
Date: Tue, 23 Aug 2011 00:36:15 +0000
Subject: [PATCH] fix timestamp stuff, more fallout from bad merge attempt

---
 maintenance/dumpTextPass.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index 0ece9713f3..822ea187a4 100644
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -181,6 +181,7 @@ class TextPassDumper extends BackupDumper {
 
 		if ( $this->reporting ) {
 			$now = wfTimestamp( TS_DB );
+			$nowts = wfTime();
 			$deltaAll = wfTime() - $this->startTime;
 			$deltaPart = wfTime() - $this->lastTime;
 			$this->pageCountPart = $this->pageCount - $this->pageCountLast;
@@ -221,7 +222,7 @@ 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->lastTime = $nowts;
 			$this->revCountLast = $this->revCount;
 			$this->prefetchCountLast = $this->prefetchCount;
 			$this->fetchCountLast = $this->fetchCount;
@@ -233,6 +234,10 @@ class TextPassDumper extends BackupDumper {
 	}
 
 	function checkIfTimeExceeded() {
+		$m1 = $this->maxTimeAllowed;
+		$m2 = $this->lastTime; 
+		$m3 =  $this->timeOfCheckpoint;
+		$m4 = $this->lastTime - $this->timeOfCheckpoint;
 		if ( $this->maxTimeAllowed &&  ( $this->lastTime - $this->timeOfCheckpoint  > $this->maxTimeAllowed ) ) {
 			return True;
 		}
-- 
2.20.1