diff options
author | Giles Bowkett <gilesb@gmail.com> | 2009-03-17 12:41:15 -0700 |
---|---|---|
committer | Giles Bowkett <gilesb@gmail.com> | 2009-03-17 12:41:15 -0700 |
commit | 168e3958df38b7f6738d60f2510a2e6d1ebcc9fb (patch) | |
tree | 401e8d45bef25f72767bbc80bcd828afbdf22eb8 | |
parent | a8bf6fa30882cdbb2c84b1840f3bd3f10894af3d (diff) | |
download | rails-168e3958df38b7f6738d60f2510a2e6d1ebcc9fb.tar.gz rails-168e3958df38b7f6738d60f2510a2e6d1ebcc9fb.tar.bz2 rails-168e3958df38b7f6738d60f2510a2e6d1ebcc9fb.zip |
this page referred to an :href_options keyword hash, in fact the correct keyword (the one the code responds to) is :html
-rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 48bf4717ad..573b99b96e 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -324,7 +324,7 @@ module ActionView # Turns all URLs and e-mail addresses into clickable links. The <tt>:link</tt> option # will limit what should be linked. You can add HTML attributes to the links using - # <tt>:href_options</tt>. Possible values for <tt>:link</tt> are <tt>:all</tt> (default), + # <tt>:html</tt>. Possible values for <tt>:link</tt> are <tt>:all</tt> (default), # <tt>:email_addresses</tt>, and <tt>:urls</tt>. If a block is given, each URL and # e-mail address is yielded and the result is used as the link text. # @@ -341,7 +341,7 @@ module ActionView # # => "Visit http://www.loudthinking.com/ or e-mail <a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a>" # # post_body = "Welcome to my new blog at http://www.myblog.com/. Please e-mail me at me@email.com." - # auto_link(post_body, :href_options => { :target => '_blank' }) do |text| + # auto_link(post_body, :html => { :target => '_blank' }) do |text| # truncate(text, 15) # end # # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\" target=\"_blank\">http://www.m...</a>. @@ -359,7 +359,7 @@ module ActionView # auto_link(post_body, :all, :target => "_blank") # => Once upon\na time # # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\" target=\"_blank\">http://www.myblog.com</a>. # Please e-mail me at <a href=\"mailto:me@email.com\">me@email.com</a>." - def auto_link(text, *args, &block)#link = :all, href_options = {}, &block) + def auto_link(text, *args, &block)#link = :all, html = {}, &block) return '' if text.blank? options = args.size == 2 ? {} : args.extract_options! # this is necessary because the old auto_link API has a Hash as its last parameter |