* (bug 25506) Exception is thrown if OutputPage::parse is called inside a tag hook...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b4ae6c2..2595c3b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -68,6 +68,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * 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
 
 === API changes in 1.18 ===
 * (bug 26339) Throw warning when truncating an overlarge API result

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index fd527d2..81eefa5 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1187,6 +1187,13 @@ class OutputPage {
         * @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() ) ) {