From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Wed, 19 Oct 2011 20:01:50 +0000 (+0000)
Subject: Revert r100262 — wasn't the right place for it and other problems,
X-Git-Tag: 1.31.0-rc.0~27000
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=4bd08afcb7054b661730fbc570787c1c1e37b90b;p=lhc%2Fweb%2Fwiklou.git

Revert r100262 — wasn't the right place for it and other problems,
like broken parser tests.

Please read [[Manual:Pre-commit checklist]] before committing.
---

diff --git a/includes/parser/StripState.php b/includes/parser/StripState.php
index aaeb8e9c6b..357dc2c8bf 100644
--- a/includes/parser/StripState.php
+++ b/includes/parser/StripState.php
@@ -107,9 +107,6 @@ class StripState {
 		if ( isset( $this->data[$this->tempType][$m[1]] ) ) {
 			return $this->data[$this->tempType][$m[1]];
 		} else {
-			if( preg_match( $this->regex, $m[0] ) ) {
-				return "<strong class='error'>".htmlspecialchars( wfMsg( "stripstate-error" ) )."</strong>";
-			}
 			return $m[0];
 		}
 	}
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c521b510e8..a69dfac39a 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4471,7 +4471,6 @@ You can also [[Special:EditWatchlist|use the standard editor]].',
 # Core parser functions
 'unknown_extension_tag' => 'Unknown extension tag "$1"',
 'duplicate-defaultsort' => '\'\'\'Warning:\'\'\' Default sort key "$2" overrides earlier default sort key "$1".',
-'stripstate-error'      => 'unstripCallback called with strip markers still intact.  Please fix your markup.',
 
 # Special:Version
 'version'                       => 'Version',