aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-03-28 17:58:15 +0200
committerPiotr Sarnacki <drogus@gmail.com>2012-03-28 18:03:16 +0200
commit5a5ca14cb2f636b9edf03b56bd9aae4cef5c7200 (patch)
tree80c7c971da33cd5a3d63c15e1c36afad87f022b7 /actionpack/lib
parent128cfbdf4d316a544a76e5c58dbeac153f3d4e36 (diff)
downloadrails-5a5ca14cb2f636b9edf03b56bd9aae4cef5c7200.tar.gz
rails-5a5ca14cb2f636b9edf03b56bd9aae4cef5c7200.tar.bz2
rails-5a5ca14cb2f636b9edf03b56bd9aae4cef5c7200.zip
Cover one more case in auth_token and remote forms
If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/form_tag_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 63451e2c36..fb6dfff9b8 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -629,7 +629,7 @@ module ActionView
if html_options["data-remote"] &&
!embed_authenticity_token_in_remote_forms &&
- html_options["authenticity_token"] != true
+ html_options["authenticity_token"].blank?
# The authenticity token is taken from the meta tag in this case
html_options["authenticity_token"] = false
elsif html_options["authenticity_token"] == true