r68844 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r68843‎ | r68844 | r68845 >
Date:18:11, 1 July 2010
Author:werdna
Status:deferred
Tags:
Comment:
Merge r68843
Modified paths:
  • /branches/wmf/1.16wmf4/extensions/StrategyWiki (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/StrategyWiki/ActiveStrategy/ParserFunctions.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/extensions/StrategyWiki/ActiveStrategy/ParserFunctions.php
@@ -2,6 +2,7 @@
33
44 class ActiveStrategyPF {
55 static function activityTag( $str, $args, $parser ) {
 6+ $parser->getOutput()->updateCacheExpiry( 900 );
67 return ActiveStrategy::getOutput( $args );
78 }
89
Property changes on: branches/wmf/1.16wmf4/extensions/StrategyWiki
___________________________________________________________________
Name: svn:mergeinfo
910 - /branches/wmf-deployment/extensions/StrategyWiki:60970
/trunk/extensions/StrategyWiki:66058-67532,67775,67778,67939-67940,67942,68196,68198,68200,68202,68204,68206,68488,68672
/trunk/phase3/extensions/StrategyWiki:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816
1011 + /branches/wmf-deployment/extensions/StrategyWiki:60970
/trunk/extensions/StrategyWiki:66058-67532,67775,67778,67939-67940,67942,68196,68198,68200,68202,68204,68206,68488,68672,68843
/trunk/phase3/extensions/StrategyWiki:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816

Follow-up revisions

RevisionCommit summaryAuthorDate
r68895Revert r68844, depends on r67185werdna17:57, 2 July 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r68843Set cache expiry for ActiveStrategy to 900 s (15min)werdna18:09, 1 July 2010

Status & tagging log