r107046 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r107045‎ | r107046 | r107047 >
Date:09:24, 22 December 2011
Author:hashar
Status:ok
Tags:
Comment:
MFT to REL1_18 r100610, bug 31921

This is a regression in REL1_18:

(bug 31921) Magic words REVISIONDAY, REVISIONMONTH and REVISIONYEAR now
give current values on preview
Modified paths:
  • /branches/REL1_18/phase3/RELEASE-NOTES-1.18 (modified) (history)
  • /branches/REL1_18/phase3/includes/parser/Parser.php (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/RELEASE-NOTES-1.18
——@@ -21,6 +21,8 @@
2222 * Fixed exception when using Special:WhatLinksHere on a Media: file.
2323 * (bug 32709) Private Wiki users were always taken to Special:Badtitle on login.
2424 * (bug 33240) Sort images are missing but referenced in css.
 25+* (bug 31921) Magic words REVISIONDAY, REVISIONMONTH and REVISIONYEAR were
 26+ not showing their values on preview.
2527
2628 == MediaWiki 1.18 ==
2729 2011-11-24
Index: branches/REL1_18/phase3/includes/parser/Parser.php
——@@ -5207,21 +5207,19 @@
52085208 if ( is_null( $this->mRevisionTimestamp ) ) {
52095209 wfProfileIn( __METHOD__ );
52105210
 5211+ global $wgContLang;
 5212+
52115213 $revObject = $this->getRevisionObject();
5212 - $timestamp = $revObject ? $revObject->getTimestamp() : false;
 5214+ $timestamp = $revObject ? $revObject->getTimestamp() : wfTimestampNow();
52135215
5214 - if( $timestamp !== false ) {
5215 - global $wgContLang;
 5216+ # The cryptic '' timezone parameter tells to use the site-default
 5217+ # timezone offset instead of the user settings.
 5218+ #
 5219+ # Since this value will be saved into the parser cache, served
 5220+ # to other users, and potentially even used inside links and such,
 5221+ # it needs to be consistent for all visitors.
 5222+ $this->mRevisionTimestamp = $wgContLang->userAdjust( $timestamp, '' );
52165223
5217 - # The cryptic '' timezone parameter tells to use the site-default
5218 - # timezone offset instead of the user settings.
5219 - #
5220 - # Since this value will be saved into the parser cache, served
5221 - # to other users, and potentially even used inside links and such,
5222 - # it needs to be consistent for all visitors.
5223 - $this->mRevisionTimestamp = $wgContLang->userAdjust( $timestamp, '' );
5224 - }
5225 -
52265224 wfProfileOut( __METHOD__ );
52275225 }
52285226 return $this->mRevisionTimestamp;
Property changes on: branches/REL1_18/phase3/includes/parser/Parser.php
___________________________________________________________________
Added: svn:mergeinfo
52295227 Merged /branches/new-installer/phase3/includes/parser/Parser.php:r43664-66004
52305228 Merged /branches/wmf-deployment/includes/parser/Parser.php:r53381
52315229 Merged /branches/REL1_15/phase3/includes/parser/Parser.php:r51646
52325230 Merged /branches/wmf/1.18wmf1/includes/parser/Parser.php:r98962,98971,99004,99065,104486
52335231 Merged /branches/sqlite/includes/parser/Parser.php:r58211-58321
52345232 Merged /trunk/phase3/includes/parser/Parser.php:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93065,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93726,93818-93822,93834,93847,93858,93891,93935-93936,93977,94058,94062,94068,94107,94155,94171,94199,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,96178,96182,96437-96438,97175,97291,97806,97815,97895,98069,98193-98194,98210,98212,98235,98237,98298,98374,98379,98411,98426,98502,98602-98603,98605,98610,98612,98656,98676,98703,98707,98713,98716,98718-98720,98755-98756,98760-98761,98774,98812,98880,98884,98927,98963,98975,98990,98997,99081-99082,99102,99104,99118,99126,99135-99136,99138,99172,99236,99250,99252,99254,99286,99304,99308,99318,99323,99332,99349,99369-99371,99477,99630,99632,99680,99694,99700,99897,99910,99914,99931,99952,100021,100115,100211,100219,100221,100223,100226,100239,100242,100347,100398,100510,100572,100575,100592,100610,100701,101010,101306,101314,101370,101376,101417,101420,101445,101449-101451,101454,101464,101470,101476,101591,101666,101860,101990,102027,102301,102303,102334-102335,102414,102440,102488,102498,102537,102710,102751,102951,102954,103328,103634,103672,103677,104033,104318,104322,104350,104434,104445,104475

Follow-up revisions

RevisionCommit summaryAuthorDate
r107047remove bug 31921 from 1.19 RN...hashar09:25, 22 December 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r100610* (bug 31921) Fix for r78201: magic words REVISIONDAY, REVISIONMONTH and REVI...ialex16:14, 24 October 2011

Status & tagging log