Fixed: inline code with less-then/greater-than produces @lt; and @gt; (#1416).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3567 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: inline code with less-then/greater-than produces @lt; and @gt; (#1416).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3567 e93f8b46-1217-0410-a6f0-8f06a7374b81
054ff0db · Jean-Philippe Lang · 3dc4dbe3 · 054ff0db · 054ff0db
Commit 054ff0db authored Mar 12, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 3 deletions

redcloth3.rb lib/redcloth3.rb +3 -3

textile_formatter_test.rb ...nit/lib/redmine/wiki_formatting/textile_formatter_test.rb +19 -0

No files found.
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -613,7 +613,7 @@ class RedCloth3 < String
        text.gsub!( CODE_RE ) do |m|
            before,lang,code,after = $~[1..4]
            lang = " lang=\"#{ lang }\"" if lang
-            rip_offtags( "#{ before }<code#{ lang }>#{ code }</code>#{ after }" )
+            rip_offtags( "#{ before }<code#{ lang }>#{ code }</code>#{ after }", false )
        end
    end
@@ -1054,7 +1054,7 @@ class RedCloth3 < String
        end
    end
-    def rip_offtags( text )
+    def rip_offtags( text, escape_aftertag=true )
        if text =~ /<.*>/
            ## strip and encode <pre> content
            codepre, used_offtags = 0, {}
@@ -1068,7 +1068,7 @@ class RedCloth3 < String
                        @pre_list.last << line
                        line = ""
                    else
-                        htmlesc( aftertag, :NoQuotes ) if aftertag
+                        htmlesc( aftertag, :NoQuotes ) if aftertag && escape_aftertag
                        line = "<redpre##{ @pre_list.length }>"
                        $3.match(/<#{ OFFTAGS }([^>]*)>/)
                        tag = $1

--- a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
@@ -60,4 +60,23 @@ class Redmine::WikiFormatting::TextileFormatterTest < HelperTestCase
      end
    end
  end
+  def test_inline_code
+    to_test = {
+      'this is @some code@'      => 'this is <code>some code</code>',
+      '@<Location /redmine>@'    => '<code>&lt;Location /redmine&gt;</code>',
+    }
+    to_test.each do |text, expected|
+      assert_equal "<p>#{expected}</p>", @formatter.new(text).to_html
+    end
+  end
+  def test_escaping
+    to_test = {
+      'this is a <script>'      => 'this is a &lt;script&gt;',
+    }
+    to_test.each do |text, expected|
+      assert_equal "<p>#{expected}</p>", @formatter.new(text).to_html
+    end
+  end
 end