* (bug 5499) Don't clear the tag strip state when asked not to clear state.

  Fixes regression with use of <ref> in a template breaking <nowiki> etc.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ddba13d..86e95aa 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -38,6 +38,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5507) Changed mediawiki:logouttext from plain to wikitext
 * (bug 4760) Prevent creation of entries in protection log when protection levels haven't changed
 * (bug 861) Show page protection/unprotection events in histories
+* (bug 5499) Don't clear the tag strip state when asked not to clear state.
+  Fixes regression with use of <ref> in a template breaking <nowiki> etc.
+
 
 == Compatibility ==
 

diff --git a/includes/Parser.php b/includes/Parser.php
index 6d031d6..3eaf38b 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -201,8 +201,6 @@ class Parser
                $this->mRevisionId = $revid;
                $this->mOutputType = OT_HTML;
 
-               $this->mStripState = NULL;
-
                //$text = $this->strip( $text, $this->mStripState );
                // VOODOO MAGIC FIX! Sometimes the above segfaults in PHP5.
                $x =& $this->mStripState;