aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-06 17:13:17 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-06 17:13:17 -0700
commitbf07c79a02d7498c9025d97b1302a80d21066ba5 (patch)
tree7b2dd5e81001a6046343b01af4f963118eca4c87 /actionpack/lib
parentf668ab9adf85d3662067a8216c5b52b934c2167f (diff)
parent380800e4a272db98f3dd267f82e0ce1e4d03f4b8 (diff)
downloadrails-bf07c79a02d7498c9025d97b1302a80d21066ba5.tar.gz
rails-bf07c79a02d7498c9025d97b1302a80d21066ba5.tar.bz2
rails-bf07c79a02d7498c9025d97b1302a80d21066ba5.zip
Merge pull request #7865 from teleological/link_to_remote_3_2
Accept :remote as symbol in link_to options (backport)
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 1f1cd3cee3..812bb4de9e 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -633,7 +633,9 @@ module ActionView
end
def link_to_remote_options?(options)
- options.is_a?(Hash) && options.key?('remote') && options.delete('remote')
+ if options.is_a?(Hash)
+ options.delete('remote') || options.delete(:remote)
+ end
end
def add_method_to_attributes!(html_options, method)