kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

strip_tags passes through blank args such as nil or "". Closes #6702, references #2229.

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5629 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper 2006-11-26 01:00:10 +00:00
parent eacca8d7e6
commit 1d564d97c5
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/CHANGELOG
View file

@ -268,7 +268,7 @@
* radio_button_tag generates unique id attributes. #3353 [Bob Silva, somekool@gmail.com] * radio_button_tag generates unique id attributes. #3353 [Bob Silva, somekool@gmail.com]
* strip_tags returns nil for a blank arg such as nil or "". #2229 [duncan@whomwah.com] * strip_tags passes through blank args such as nil or "". #2229, #6702 [duncan@whomwah.com, dharana]
* Cleanup assert_tag :children counting. #2181 [jamie@bravenet.com] * Cleanup assert_tag :children counting. #2181 [jamie@bravenet.com]

2
actionpack/lib/action_view/helpers/text_helper.rb
View file

@ -254,7 +254,7 @@ module ActionView
# html-scanner tokenizer and so its HTML parsing ability is limited by # html-scanner tokenizer and so its HTML parsing ability is limited by
# that of html-scanner. # that of html-scanner.
def strip_tags(html) def strip_tags(html)
return nil if html.blank? return html if html.blank?
if html.index("<") if html.index("<")
text = "" text = ""
tokenizer = HTML::Tokenizer.new(html) tokenizer = HTML::Tokenizer.new(html)

2
actionpack/test/template/text_helper_test.rb
View file

@ -321,6 +321,6 @@ class TextHelperTest < Test::Unit::TestCase
%{This is a test.\n\n\nIt no longer contains any HTML.\n}, strip_tags( %{This is a test.\n\n\nIt no longer contains any HTML.\n}, strip_tags(
%{<title>This is <b>a <a href="" target="_blank">test</a></b>.</title>\n\n<!-- it has a comment -->\n\n<p>It no <b>longer <strong>contains <em>any <strike>HTML</strike></em>.</strong></b></p>\n})) %{<title>This is <b>a <a href="" target="_blank">test</a></b>.</title>\n\n<!-- it has a comment -->\n\n<p>It no <b>longer <strong>contains <em>any <strike>HTML</strike></em>.</strong></b></p>\n}))
assert_equal "This has a here.", strip_tags("This has a <!-- comment --> here.") assert_equal "This has a here.", strip_tags("This has a <!-- comment --> here.")
[nil, '', ' '].each { |blank| assert_nil strip_tags(blank) } [nil, '', ' '].each { |blank| assert_equal blank, strip_tags(blank) }
end end
end end