Fixed pre tags containing "<pre*" (#4125).

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

Fixed pre tags containing "<pre*" (#4125).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3030 e93f8b46-1217-0410-a6f0-8f06a7374b81
1d8b4ee7 · Jean-Philippe Lang · 22d12032 · 1d8b4ee7 · 1d8b4ee7
Commit 1d8b4ee7 authored Nov 11, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 1 deletion

redcloth3.rb lib/redcloth3.rb +1 -1

application_helper_test.rb test/unit/helpers/application_helper_test.rb +22 -0

No files found.
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -1016,7 +1016,7 @@ class RedCloth3 < String
    end
    
    OFFTAGS = /(code|pre|kbd|notextile)/
-    OFFTAG_MATCH = /(?:(<\/#{ OFFTAGS }>)|(<#{ OFFTAGS }[^>]*>))(.*?)(?=<\/?#{ OFFTAGS }|\Z)/mi
+    OFFTAG_MATCH = /(?:(<\/#{ OFFTAGS }>)|(<#{ OFFTAGS }[^>]*>))(.*?)(?=<\/?#{ OFFTAGS }\W|\Z)/mi
    OFFTAG_OPEN = /<#{ OFFTAGS }/
    OFFTAG_CLOSE = /<\/?#{ OFFTAGS }/
    HASTAG_MATCH = /(<\/?\w[^\n]*?>)/m

--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -258,6 +258,28 @@ RAW
    to_test.each { |text, result| assert_equal result, textilizable(text) }
  end
  
+  def test_pre_tags
+    raw = <<-RAW
+Before
+
+<pre>
+<prepared-statement-cache-size>32</prepared-statement-cache-size>
+</pre>
+
+After
+RAW
+
+    expected = <<-EXPECTED
+<p>Before</p>
+<pre>
+&lt;prepared-statement-cache-size&gt;32&lt;/prepared-statement-cache-size&gt;
+</pre>
+<p>After</p>
+EXPECTED
+    
+    assert_equal expected.gsub(%r{[\r\n\t]}, ''), textilizable(raw).gsub(%r{[\r\n\t]}, '')
+  end
+  
  def test_syntax_highlight
    raw = <<-RAW
 <pre><code class="ruby">