http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69083
Revision: 69083
Author: aaron
Date: 2010-07-06 06:29:47 +0000 (Tue, 06 Jul 2010)
Log Message:
-----------
* Format getFileTimestamp() correctly with TS_MW
* Follow-up r69082:
** Fixed return value of parserFindStableFile()
** Fixed timestamp in getStableFileVersions()
** Made some FRInclusionManager code less verbose
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FRInclusionManager.php
trunk/extensions/FlaggedRevs/FlaggedRevision.php
trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
Modified: trunk/extensions/FlaggedRevs/FRInclusionManager.php
===================================================================
--- trunk/extensions/FlaggedRevs/FRInclusionManager.php 2010-07-06 05:47:02 UTC
(rev 69082)
+++ trunk/extensions/FlaggedRevs/FRInclusionManager.php 2010-07-06 06:29:47 UTC
(rev 69083)
@@ -106,10 +106,8 @@
}
$dbKey = $title->getDBkey();
$namespace = $title->getNamespace();
- if ( isset( $this->reviewedVersions['templates'][$namespace] )
) {
- if ( isset(
$this->reviewedVersions['templates'][$namespace][$dbKey] ) ) {
- return
$this->reviewedVersions['templates'][$namespace][$dbKey];
- }
+ if ( isset(
$this->reviewedVersions['templates'][$namespace][$dbKey] ) ) {
+ return
$this->reviewedVersions['templates'][$namespace][$dbKey];
}
return null; // missing version
}
@@ -142,10 +140,8 @@
$dbKey = $title->getDBkey();
$namespace = $title->getNamespace();
$id = null;
- if ( isset( $this->stableVersions['templates'][$namespace] ) ) {
- if ( isset(
$this->stableVersions['templates'][$namespace][$dbKey] ) ) {
- $id =
$this->stableVersions['templates'][$namespace][$dbKey];
- }
+ if ( isset(
$this->stableVersions['templates'][$namespace][$dbKey] ) ) {
+ $id =
$this->stableVersions['templates'][$namespace][$dbKey];
}
if ( $id === null ) { // cache miss
$srev = FlaggedRevision::newFromStable( $title );
Modified: trunk/extensions/FlaggedRevs/FlaggedRevision.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevision.php 2010-07-06 05:47:02 UTC
(rev 69082)
+++ trunk/extensions/FlaggedRevs/FlaggedRevision.php 2010-07-06 06:29:47 UTC
(rev 69083)
@@ -444,7 +444,7 @@
* This returns NULL for non-image page revisions.
*/
public function getFileTimestamp() {
- return $this->mFileTimestamp;
+ return wfTimestampOrNull( TS_MW, $this->mFileTimestamp );
}
/**
@@ -571,7 +571,7 @@
$reviewedTS = '0';
$reviewedSha1 = '';
if ( $row->fr_img_timestamp ) {
- $reviewedTS = wfTimestamp( TS_MW, $reviewedTS );
+ $reviewedTS = wfTimestamp( TS_MW, $row->fr_img_timestamp );
$reviewedSha1 = strval( $row->fr_img_sha1 );
}
$this->mStableFiles[$row->fi_name] = array();
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2010-07-06 05:47:02 UTC
(rev 69082)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2010-07-06 06:29:47 UTC
(rev 69083)
@@ -442,7 +442,7 @@
$parser->mOutput->fr_fileSHA1Keys[$title->getDBkey()]['ts'] = $time;
$parser->mOutput->fr_fileSHA1Keys[$title->getDBkey()]['sha1'] = $sha1;
}
- return true;
+ return array( $time, $sha1 );
}
/**
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
