From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 20:31:36 +0000 (+0000)
Subject: Fixed: notextile tag has no effect.
X-Git-Tag: 0.8.0-RC1~464
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0389c60129636969d3727b752625d95a559deff6;p=redmine.git

Fixed: notextile tag has no effect.

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

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 3880eb9d3..42eddd8e0 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -1149,7 +1149,7 @@ class RedCloth < String
         end
     end
     
-    ALLOWED_TAGS = %w(redpre pre code)
+    ALLOWED_TAGS = %w(redpre pre code notextile)
     
     def escape_html_tags(text)
       text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 4f8ededd1..1e75dbd64 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -153,6 +153,14 @@ class ApplicationHelperTest < HelperTestCase
     to_test.each { |text, result| assert_equal result, textilizable(text) }
   end
   
+  def test_allowed_html_tags
+    to_test = {
+      "<pre>preformatted text</pre>" => "<pre>preformatted text</pre>",
+      "<notextile>no *textile* formatting</notextile>" => "no *textile* formatting",
+    }
+    to_test.each { |text, result| assert_equal result, textilizable(text) }
+  end
+  
   def test_wiki_links_in_tables
     to_test = {"|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" =>
                  '<tr><td><a href="/wiki/ecookbook/Page" class="wiki-page new">Link title</a></td>' +