From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 31 May 2007 16:49:33 +0000 (+0000)
Subject: *Use $this->requestedTime, $this->requestedTimestamp was floating around in some... 
X-Git-Tag: 1.31.0-rc.0~52748
X-Git-Url: http://git.cyclocoop.org/%22%20%20.%20generer_url_ecrire%28%22mots_tous%22%29%20.%20%22?a=commitdiff_plain;h=f2d1e62b25c5d5408b7a65a4d1f811e5023707d1;p=lhc%2Fweb%2Fwiklou.git

*Use $this->requestedTime, $this->requestedTimestamp was floating around in some places, causing image conditions to be borked
---

diff --git a/includes/filerepo/OldLocalFile.php b/includes/filerepo/OldLocalFile.php
index 1a802a0a13..846f728afd 100644
--- a/includes/filerepo/OldLocalFile.php
+++ b/includes/filerepo/OldLocalFile.php
@@ -156,10 +156,10 @@ class OldLocalFile extends LocalFile {
 		wfProfileIn( __METHOD__ );
 		$dbr = $this->repo->getSlaveDB();
 		$conds = array( 'oi_name' => $this->getName() );
-		if ( is_null( $this->requestedTimestamp ) ) {
+		if ( is_null( $this->requestedTime ) ) {
 			$conds['oi_archive_name'] = $this->archive_name;
 		} else {
-			$conds[] = 'oi_timestamp <= ' . $dbr->addQuotes( $this->requestedTimestamp );
+			$conds[] = 'oi_timestamp <= ' . $dbr->addQuotes( $this->requestedTime );
 		}
 		$row = $dbr->selectRow( 'oldimage', $this->getCacheFields( 'oi_' ),
 			$conds, __METHOD__, array( 'ORDER BY' => 'oi_timestamp DESC' ) );