r63521 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r63520‎ | r63521 | r63522 >
Date:23:11, 9 March 2010
Author:werdna
Status:deferred
Tags:
Comment:
Merge r63154 into all LiquidThreads versions
Modified paths:
  • /branches/wmf-deployment/extensions/LiquidThreads/classes/View.php (modified) (history)
  • /branches/wmf-deployment/extensions/LiquidThreads_alpha/classes/View.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/extensions/LiquidThreads/classes/View.php
@@ -1759,15 +1759,17 @@
17601760
17611761 static function signaturePST( $sig, $user ) {
17621762 global $wgParser, $wgOut, $wgTitle;
 1763+
 1764+ $title = $wgTitle ? $wgTitle : $user->getUserPage()->getTitle();
17631765
17641766 // Parser gets antsy about parser options here if it hasn't parsed anything before.
17651767 $wgParser->clearState();
1766 - $wgParser->setTitle( $wgTitle );
 1768+ $wgParser->setTitle( $title );
17671769 $wgParser->mOptions = new ParserOptions;
17681770
17691771 $sig = $wgParser->preSaveTransform(
17701772 $sig,
1771 - $wgTitle,
 1773+ $title,
17721774 $user,
17731775 $wgParser->mOptions,
17741776 false
Property changes on: branches/wmf-deployment/extensions/LiquidThreads/classes/View.php
___________________________________________________________________
Name: svn:mergeinfo
17751777 + /branches/wmf-deployment/extensions/LiquidThreads/classes/View.php:63154
/trunk/extensions/LiquidThreads/classes/View.php:57390,58990-62113,63154
Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/classes/View.php
@@ -1808,15 +1808,17 @@
18091809
18101810 static function signaturePST( $sig, $user ) {
18111811 global $wgParser, $wgOut, $wgTitle;
 1812+
 1813+ $title = $wgTitle ? $wgTitle : $user->getUserPage()->getTitle();
18121814
18131815 // Parser gets antsy about parser options here if it hasn't parsed anything before.
18141816 $wgParser->clearState();
1815 - $wgParser->setTitle( $wgTitle );
 1817+ $wgParser->setTitle( $title );
18161818 $wgParser->mOptions = new ParserOptions;
18171819
18181820 $sig = $wgParser->preSaveTransform(
18191821 $sig,
1820 - $wgTitle,
 1822+ $title,
18211823 $user,
18221824 $wgParser->mOptions,
18231825 false
Property changes on: branches/wmf-deployment/extensions/LiquidThreads_alpha/classes/View.php
___________________________________________________________________
Name: svn:mergeinfo
18241826 + /trunk/extensions/LiquidThreads/classes/View.php:57390,58990-62343,63154

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r63154Use a dummy title where appropriate for applying PST to signatureswerdna23:48, 1 March 2010

Status & tagging log