Redmine 4.1.1

lib/redmine/wiki_formatting/textile/formatter.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Redmine - project management software
-# Copyright (C) 2006-2017  Jean-Philippe Lang
+# Copyright (C) 2006-2019  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -27,9 +29,10 @@ module Redmine
 
         alias :inline_auto_link :auto_link!
         alias :inline_auto_mailto :auto_mailto!
+        alias :inline_restore_redmine_links :restore_redmine_links
 
         # auto_link rule after textile rules so that it doesn't break !image_url! tags
-        RULES = [:textile, :block_markdown_rule, :inline_auto_link, :inline_auto_mailto]
+        RULES = [:textile, :block_markdown_rule, :inline_auto_link, :inline_auto_mailto, :inline_restore_redmine_links]
 
         def initialize(*args)
           super
@@ -62,9 +65,9 @@ module Redmine
           @pre_list = []
           text = self.dup
           rip_offtags text, false, false
-          before = ''
-          s = ''
-          after = ''
+          before = +''
+          s = +''
+          after = +''
           i = 0
           l = 1
           started = false
@@ -105,7 +108,7 @@ module Redmine
           sections
         end
 
-      private
+        private
 
         # Patch for RedCloth.  Fixed in RedCloth r128 but _why hasn't released it yet.
         # <a href="http://code.whytheluckystiff.net/redcloth/changeset/128">http://code.whytheluckystiff.net/redcloth/changeset/128</a>
@@ -125,6 +128,7 @@ module Redmine
                 language = $1 || $2
                 text = $3
                 if Redmine::SyntaxHighlighting.language_supported?(language)
+                  text.gsub!(/x%x%/, '&')
                   content = "<code class=\"#{language} syntaxhl\">" +
                     Redmine::SyntaxHighlighting.highlight_by_language(text, language)
                 else