Fixes html escaping.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1901 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixes html escaping.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1901 e93f8b46-1217-0410-a6f0-8f06a7374b81
2e7e26fb · Jean-Philippe Lang · 9131cdf6 · 2e7e26fb · 2e7e26fb
Commit 2e7e26fb authored Sep 23, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

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

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

No files found.
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -1045,17 +1045,17 @@ class RedCloth3 < String
                    codepre += 1
                    used_offtags[offtag] = true
                    if codepre - used_offtags.length > 0
-                        htmlesc( line, :NoQuotes ) unless used_offtags['notextile']
+                        htmlesc( line, :NoQuotes )
                        @pre_list.last << line
                        line = ""
                    else
-                        htmlesc( aftertag, :NoQuotes ) if aftertag and not used_offtags['notextile']
+                        htmlesc( aftertag, :NoQuotes ) if aftertag
                        line = "<redpre##{ @pre_list.length }>"
                        @pre_list << "#{ $3 }#{ aftertag }"
                    end
                elsif $1 and codepre > 0
                    if codepre - used_offtags.length > 0
-                        htmlesc( line, :NoQuotes ) unless used_offtags['notextile']
+                        htmlesc( line, :NoQuotes )
                        @pre_list.last << line
                        line = ""
                    end

--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -190,6 +190,7 @@ class ApplicationHelperTest < HelperTestCase
    to_test = {
      "<pre>preformatted text</pre>" => "<pre>preformatted text</pre>",
      "<notextile>no *textile* formatting</notextile>" => "no *textile* formatting",
+      "<notextile>this is <tag>a tag</tag></notextile>" => "this is &lt;tag&gt;a tag&lt;/tag&gt;"
    }
    to_test.each { |text, result| assert_equal result, textilizable(text) }
  end