aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorErik St. Martin <alakriti@gmail.com>2010-01-26 14:38:57 -0500
committerStefan Penner <stefan.penner@gmail.com>2010-01-27 12:44:35 -0600
commitc0f63883ea24925d4e03c258b874e49cf507cc33 (patch)
tree75c4703e99340be60b6823b645f1f55515235ea2 /actionpack/lib
parentf661a3bc599ac336aeaf643a8d1d388fe905a07d (diff)
downloadrails-c0f63883ea24925d4e03c258b874e49cf507cc33.tar.gz
rails-c0f63883ea24925d4e03c258b874e49cf507cc33.tar.bz2
rails-c0f63883ea24925d4e03c258b874e49cf507cc33.zip
:href should be comming in through html_options and not options
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/ajax_helper.rb2
1 files changed, 1 insertions, 1 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)