https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112284
Revision: 112284
Author: aaron
Date: 2012-02-24 01:16:18 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
MFT r112282
Modified Paths:
--------------
branches/wmf/1.19wmf1/extensions/FlaggedRevs/backend/FlaggedRevs.hooks.php
Property Changed:
----------------
branches/wmf/1.19wmf1/extensions/
branches/wmf/1.19wmf1/extensions/FlaggedRevs/
Property changes on: branches/wmf/1.19wmf1/extensions
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/extensions:100352-107913
/branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/branches/wmf/1.18wmf1/extensions:97508
/trunk/extensions:111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166
/trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
+ /branches/JSTesting/extensions:100352-107913
/branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/branches/wmf/1.18wmf1/extensions:97508
/trunk/extensions:111043,111199,111218,111484,111575,111604,111659-111661,111668,111670,111688,111690,111698,111713,111715,111780,111796,111814,111947,112074,112153,112160,112166,112260,112282
/trunk/phase3/extensions:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251
Property changes on: branches/wmf/1.19wmf1/extensions/FlaggedRevs
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/chad-pre-wmf-merge/extensions/FlaggedRevs:76925
+ /branches/chad-pre-wmf-merge/extensions/FlaggedRevs:76925
/trunk/extensions/FlaggedRevs:112282
Modified:
branches/wmf/1.19wmf1/extensions/FlaggedRevs/backend/FlaggedRevs.hooks.php
===================================================================
--- branches/wmf/1.19wmf1/extensions/FlaggedRevs/backend/FlaggedRevs.hooks.php
2012-02-24 01:14:03 UTC (rev 112283)
+++ branches/wmf/1.19wmf1/extensions/FlaggedRevs/backend/FlaggedRevs.hooks.php
2012-02-24 01:16:18 UTC (rev 112284)
@@ -193,7 +193,7 @@
$title = Title::makeTitle( NS_FILE, $title->getDBkey()
);
$title->resetArticleId( $title->getArticleId() ); //
avoid extra queries
}
- $time = $sha1 = false; // current version
+ $time = $sha1 = false; // unspecified (defaults to current
version)
# Check for the version of this file used when reviewed...
list( $maybeTS, $maybeSha1 ) =
$incManager->getReviewedFileVersion( $title );
if ( $maybeTS !== null ) {
@@ -209,15 +209,17 @@
$sha1 = $maybeSha1;
}
}
- # Stabilize the file link
- if ( $time ) {
- if ( $query != '' ) $query .= '&';
- $query = "filetimestamp=" . urlencode( wfTimestamp(
TS_MW, $time ) );
- }
- $options['time'] = $time;
- $options['sha1'] = $sha1;
+ # Tell Parser what file version to use
if ( $time === '0' ) {
$options['broken'] = true;
+ } elseif ( $time !== false ) {
+ $options['time'] = $time;
+ $options['sha1'] = $sha1;
+ # Stabilize the file link
+ if ( $query != '' ) {
+ $query .= '&';
+ }
+ $query .= "filetimestamp=" . urlencode( wfTimestamp(
TS_MW, $time ) );
}
return true;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
