Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Make auto_link handle nil by returning quickly if blank?

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3359 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 63c822afb22ea17cffd55a3d1c3472405e977be5 1 parent b5ba377
Scott Barron authored
View
2  actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Make auto_link handle nil by returning quickly if blank? [Scott Barron]
+
* Make auto_link match urls with a port number specified. [Marcel Molina Jr.]
* Added support for toggling visual effects to ScriptaculousHelper::visual_effect, #3323. [Thomas Fuchs]
View
1  actionpack/lib/action_view/helpers/text_helper.rb
@@ -142,6 +142,7 @@ def simple_format(text)
# truncate(text, 15)
# end
def auto_link(text, link = :all, href_options = {}, &block)
+ return '' if text.blank?
case link
when :all then auto_link_urls(auto_link_email_addresses(text, &block), href_options, &block)
when :email_addresses then auto_link_email_addresses(text, &block)
View
2  actionpack/test/template/text_helper_test.rb
@@ -155,6 +155,8 @@ def test_auto_linking
assert_equal %(<p>Link #{link4_result}</p>), auto_link("<p>Link #{link4_raw}</p>")
assert_equal %(<p>#{link4_result} Link</p>), auto_link("<p>#{link4_raw} Link</p>")
assert_equal %(<p>#{link5_result} Link</p>), auto_link("<p>#{link5_raw} Link</p>")
+ assert_equal '', auto_link(nil)
+ assert_equal '', auto_link('')
end
def test_auto_link_at_eol
Please sign in to comment.
Something went wrong with that request. Please try again.