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:09:53 +0200
commitd5980b5f52c359252b53f771114a06b06b52076e (patch)
tree9929d60a25a82d2413038a35327b7121c063a7a8 /actionpack/lib
parent1b9fd797b3a3183044a3d7b9965b535ee7e27bc6 (diff)
downloadrails-d5980b5f52c359252b53f771114a06b06b52076e.tar.gz
rails-d5980b5f52c359252b53f771114a06b06b52076e.tar.bz2
rails-d5980b5f52c359252b53f771114a06b06b52076e.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 3fd91fed2d..066b98d4a2 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -622,7 +622,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