Fix for r32733: added a new array of settings that shouldn't be escaped

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 311ef53..c1d5417 100644 (file)
--- 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 5e2b4a6..be19c19 100644 (file)
--- 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 = "'";