Revert r100262 — wasn't the right place for it and other problems,
authorMark A. Hershberger <mah@users.mediawiki.org>
Wed, 19 Oct 2011 20:01:50 +0000 (20:01 +0000)
committerMark A. Hershberger <mah@users.mediawiki.org>
Wed, 19 Oct 2011 20:01:50 +0000 (20:01 +0000)
like broken parser tests.

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

includes/parser/StripState.php
languages/messages/MessagesEn.php

index aaeb8e9..357dc2c 100644 (file)
@@ -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];
                }
        }
index c521b51..a69dfac 100644 (file)
@@ -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',