r22602 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r22601‎ | r22602 | r22603 >
Date:16:49, 31 May 2007
Author:aaron
Status:old
Tags:
Comment:
*Use $this->requestedTime, $this->requestedTimestamp was floating around in some places, causing image conditions to be borked
Modified paths:
  • /trunk/phase3/includes/filerepo/OldLocalFile.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/filerepo/OldLocalFile.php
@@ -156,10 +156,10 @@
157157 wfProfileIn( __METHOD__ );
158158 $dbr = $this->repo->getSlaveDB();
159159 $conds = array( 'oi_name' => $this->getName() );
160 - if ( is_null( $this->requestedTimestamp ) ) {
 160+ if ( is_null( $this->requestedTime ) ) {
161161 $conds['oi_archive_name'] = $this->archive_name;
162162 } else {
163 - $conds[] = 'oi_timestamp <= ' . $dbr->addQuotes( $this->requestedTimestamp );
 163+ $conds[] = 'oi_timestamp <= ' . $dbr->addQuotes( $this->requestedTime );
164164 }
165165 $row = $dbr->selectRow( 'oldimage', $this->getCacheFields( 'oi_' ),
166166 $conds, __METHOD__, array( 'ORDER BY' => 'oi_timestamp DESC' ) );

Follow-up revisions

RevisionCommit summaryAuthorDate
r22619Merged revisions 22587-22618 via svnmerge from...david04:13, 1 June 2007