From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 8 Apr 2006 21:19:10 +0000 (+0000)
Subject: * (bug 5499) Don't clear the tag strip state when asked not to clear state.
X-Git-Tag: 1.31.0-rc.0~57542
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=c45f64bb47560dae7bfc60641a8c4af63b981c0f;p=lhc%2Fweb%2Fwiklou.git

* (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 ddba13dabe..86e95aa0a2 100644
--- 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 6d031d6827..3eaf38bd9a 100644
--- 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;