diff options
| -rw-r--r-- | actionpack/lib/action_view/helpers/ajax_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/ajax_helper_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/ajax_helper.rb b/actionpack/lib/action_view/helpers/ajax_helper.rb index 65315fd709..2ef791b834 100644 --- a/actionpack/lib/action_view/helpers/ajax_helper.rb +++ b/actionpack/lib/action_view/helpers/ajax_helper.rb @@ -304,7 +304,7 @@ module ActionView end attributes.merge!(html_options) - href = options[:href].nil? ? "#" : options[:href] + href = html_options[:href].nil? ? "#" : html_options[:href] attributes.merge!(:href => href) content_tag(:a, name, attributes) diff --git a/actionpack/test/template/ajax_helper_test.rb b/actionpack/test/template/ajax_helper_test.rb index 6d332d4fca..4e48543c81 100644 --- a/actionpack/test/template/ajax_helper_test.rb +++ b/actionpack/test/template/ajax_helper_test.rb @@ -103,7 +103,7 @@ class AjaxHelperTest < AjaxHelperBaseTest test "link_to_remote using explicit :href" do expected = %(<a href=\"http://www.example.com/testhref\" data-remote=\"true\" data-url=\"http://www.example.com/whatnot\" data-condition=\"$('foo').val() == true\">Remote outauthor</a>) - assert_dom_equal expected, link_to_remote("Remote outauthor", :href => 'http://www.example.com/testhref', :url => { :action => "whatnot" }, :condition => '$(\'foo\').val() == true') + assert_dom_equal expected, link_to_remote("Remote outauthor", {:url => { :action => "whatnot" }, :condition => '$(\'foo\').val() == true'}, :href => 'http://www.example.com/testhref') end test "link_to_remote using :submit" do |