From 68c831d431bce94da437f3ae09cab92b0e9ab3c4 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sat, 5 Apr 2008 10:51:47 +0000 Subject: [PATCH] Fix for r32733: added a new array of settings that shouldn't be escaped --- maintenance/language/messageTypes.inc | 5 +++++ maintenance/language/writeMessagesArray.inc | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index 311ef53f52..c1d54177f6 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -502,3 +502,8 @@ $wgEXIFMessages = array( 'exif-gpsdirection-t', 'exif-gpsdirection-m', ); + +/** Messages that shouldn't be escaped with addcslashes (regexp, ...) */ +$wgNoEscapeMessages = array( + 'linkprefix', +); \ No newline at end of file diff --git a/maintenance/language/writeMessagesArray.inc b/maintenance/language/writeMessagesArray.inc index 5e2b4a64b2..be19c19691 100644 --- a/maintenance/language/writeMessagesArray.inc +++ b/maintenance/language/writeMessagesArray.inc @@ -15,6 +15,7 @@ class MessageWriter { static $messageComments; static $ignoredMessages; static $optionalMessages; + static $noEscapeMessages; /** * Write a messages array as a PHP text and write it to the messages file. @@ -77,6 +78,7 @@ class MessageWriter { require( dirname( __FILE__ ) . '/messageTypes.inc' ); self::$ignoredMessages = $wgIgnoredMessages; self::$optionalMessages = $wgOptionalMessages; + self::$noEscapeMessages = $wgNoEscapeMessages; self::$loaded = true; } @@ -210,7 +212,8 @@ $blockComment # Check for the appropriate apostrophe and add the value # Quote \ here, because it needs always escaping - $value = addcslashes( $value, '\\' ); + if( !in_array( $key, self::$noEscapeMessages ) ) + $value = addcslashes( $value, '\\' ); # For readability $single = "'"; -- 2.20.1