From 65dd69df99f4a18c8d47d43e61d2df8d7267ad99 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Wed, 17 Aug 2011 09:55:09 +0000 Subject: [PATCH] Self-revert r79892: only got one opposition and apparently too hairy for anyone else to comment :) --- RELEASE-NOTES-1.18 | 2 -- includes/OutputPage.php | 7 ------- 2 files changed, 9 deletions(-) diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18 index 0fe33d9d55..6dbdeb0434 100644 --- a/RELEASE-NOTES-1.18 +++ b/RELEASE-NOTES-1.18 @@ -231,8 +231,6 @@ production. * If an edit summary exceeds 250 bytes and is truncated, add an ellipse. * (bug 26638) Database error pages display correctly in RTL languages. * (bug 26187) Confirmrecreate no longer parses the edit summary. -* (bug 25506) Exception is thrown if OutputPage::parse is called inside a tag - hook, which would reset parser state. * (bug 26208) Mark directionality of some interlanguage links. * (bug 26034) Make the "View / Read" tab in content_navigation style tabs remain selected when the action is "purge". diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 75272a2f86..1f09798ee2 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -1465,13 +1465,6 @@ class OutputPage extends ContextSource { * @return String: HTML */ public function parse( $text, $linestart = true, $interface = false, $language = null ) { - // Check one for one common cause for parser state resetting - $callers = wfGetAllCallers( 10 ); - if ( strpos( $callers, 'Parser::extensionSubstitution' ) !== false ) { - throw new MWException( "wfMsg* function with parsing cannot be used " . - "inside a tag hook. Should use parser->recursiveTagParse() instead" ); - } - global $wgParser; if( is_null( $this->getTitle() ) ) { -- 2.20.1