/usr/local/lib/ruby/gems/1.8/gems/actionpack-2.0.2/lib/action_view/helpers:diff text_helper.rb text_helper.rb.new 310,311c310,311 < when :all then auto_link_email_addresses(auto_link_urls(text, href_options, &block), &block) < when :email_addresses then auto_link_email_addresses(text, &block) --- > when :all then auto_link_email_addresses(auto_link_urls(text, href_options, &block), href_options, &block) > when :email_addresses then auto_link_email_addresses(text, href_options, &block) 464c464,465 < def auto_link_email_addresses(text) --- > def auto_link_email_addresses(text, href_options = {}) > extra_options = tag_options(href_options.stringify_keys) || "" 473c474 < %{#{display_text}} --- > %{#{display_text}}