Replace closing html tags with html entity (#910).

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

Replace closing html tags with html entity (#910).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1348 e93f8b46-1217-0410-a6f0-8f06a7374b81
97fe797a · Jean-Philippe Lang · 8b9fb29d · 97fe797a · 97fe797a
Commit 97fe797a authored Apr 13, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

redcloth.rb lib/redcloth.rb +1 -1

application_helper_test.rb test/unit/helpers/application_helper_test.rb +3 -2

No files found.
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -1134,7 +1134,7 @@ class RedCloth < String
    ALLOWED_TAGS = %w(redpre pre code)
    
    def escape_html_tags(text)
-      text.gsub!(%r{<((\/?)(\w+))}) {|m| ALLOWED_TAGS.include?($3) ? "<#{$1}" : "&lt;#{$1}" }
+      text.gsub!(%r{<(\/?(\w+)[^>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' if $3}" }
    end
 end

--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -134,8 +134,9 @@ class ApplicationHelperTest < HelperTestCase
  
  def test_html_tags
    to_test = {
-      "<div>content</div>" => "<p>&lt;div>content&lt;/div></p>",
-      "<script>some script;</script>" => "<p>&lt;script>some script;&lt;/script></p>",
+      "<div>content</div>" => "<p>&lt;div&gt;content&lt;/div&gt;</p>",
+      "<div class=\"bold\">content</div>" => "<p>&lt;div class=\"bold\"&gt;content&lt;/div&gt;</p>",
+      "<script>some script;</script>" => "<p>&lt;script&gt;some script;&lt;/script&gt;</p>",
      # do not escape pre/code tags
      "<pre>\nline 1\nline2</pre>" => "<pre>\nline 1\nline2</pre>",
      "<pre><code>\nline 1\nline2</code></pre>" => "<pre><code>\nline 1\nline2</code></pre>",