r81745 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r81744‎ | r81745 | r81746 >
Date:15:14, 8 February 2011
Author:catrope
Status:ok (Comments)
Tags:
Comment:
1.17wmf1: MFT r81742, r81743
Modified paths:
  • /branches/wmf/1.17wmf1/extensions/LiquidThreads/classes/View.php (modified) (history)
  • /branches/wmf/1.17wmf1/extensions/OpenSearchXml/ApiOpenSearchXml.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/extensions/LiquidThreads/classes/View.php
@@ -2166,9 +2166,9 @@
21672167 }
21682168
21692169 // Parser gets antsy about parser options here if it hasn't parsed anything before.
 2170+ $wgParser->mOptions = new ParserOptions;
21702171 $wgParser->clearState();
21712172 $wgParser->setTitle( $wgTitle );
2172 - $wgParser->mOptions = new ParserOptions;
21732173
21742174 $sig = $wgOut->parseInline( $sig );
21752175
@@ -2183,9 +2183,9 @@
21842184 $title = $wgTitle ? $wgTitle : $user->getUserPage();
21852185
21862186 // Parser gets antsy about parser options here if it hasn't parsed anything before.
 2187+ $wgParser->mOptions = new ParserOptions;
21872188 $wgParser->clearState();
21882189 $wgParser->setTitle( $title );
2189 - $wgParser->mOptions = new ParserOptions;
21902190
21912191 $sig = $wgParser->preSaveTransform(
21922192 $sig,
Index: branches/wmf/1.17wmf1/extensions/OpenSearchXml/ApiOpenSearchXml.php
@@ -261,8 +261,8 @@
262262 // First, we use the system preprocessor to break down the text
263263 // into text, templates, extensions, and comments:
264264 global $wgParser;
 265+ $wgParser->mOptions = new ParserOptions();
265266 $wgParser->clearState();
266 - $wgParser->mOptions = new ParserOptions();
267267 $frame = $wgParser->getPreprocessor()->newFrame();
268268 $dom = $wgParser->preprocessToDom( $text );
269269

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r81737Tweak for r79018: fatal errors due to something calling parser clearState whe...brion13:30, 8 February 2011
r81742Quick fix instead of r81738. This way of working is completely unsupported...platonides15:05, 8 February 2011
r81743Same as r81742. At least this agrees to be a "TERRIBLE HACK"platonides15:08, 8 February 2011

Comments

#Comment by Platonides (talk | contribs)   16:42, 8 February 2011

r81742 should be merged to LiquidThreads_alpha, too

Status & tagging log