Fixed: notextile tag has no effect.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1517 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
d77c1d2829
commit
0389c60129
|
@ -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}" : "<#{$1}#{'>' unless $3.blank?}" }
|
||||
|
|
|
@ -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>' +
|
||||
|
|
Loading…
Reference in New Issue