From fdb4ccd5d2f1fc5b6a76efde28d073b056bd8e42 Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Wed, 19 Oct 2011 19:34:56 +0000 Subject: [PATCH] Give a clear error message instead of un-intelligible UNIQ.*QINU markers. Not sure the preg_match() is actually needed. Or it may be appropriate to use MARKER_SUFFIX for the match. The error message may also need to be rewritten to be more user-friendly, but I'm pretty sure *an* error message is friendlier than UNIQ garbage. And making them visible error messages makes them easier to be found. --- includes/parser/StripState.php | 3 +++ languages/messages/MessagesEn.php | 1 + 2 files changed, 4 insertions(+) diff --git a/includes/parser/StripState.php b/includes/parser/StripState.php index 357dc2c8bf..aaeb8e9c6b 100644 --- a/includes/parser/StripState.php +++ b/includes/parser/StripState.php @@ -107,6 +107,9 @@ 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 "".htmlspecialchars( wfMsg( "stripstate-error" ) ).""; + } return $m[0]; } } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index a69dfac39a..c521b510e8 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -4471,6 +4471,7 @@ 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', -- 2.20.1