aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/csrf_helper.rb
diff options
context:
space:
mode:
authorBryan Woods <bryanwoods4e@gmail.com>2010-06-16 15:53:20 -0400
committerBryan Woods <bryanwoods4e@gmail.com>2010-06-16 15:53:20 -0400
commit5861fde01fbe9446666b319dfc8d24514aafda21 (patch)
tree4c78ceda7ec49a54b1c2454217e85d36d1a937aa /actionpack/lib/action_view/helpers/csrf_helper.rb
parentc1ff781001af157c0d5ea5ac64e1fa17d47fe1f1 (diff)
parent35e3f72af29a33189a46a4b5ada84768b87e0ef2 (diff)
downloadrails-5861fde01fbe9446666b319dfc8d24514aafda21.tar.gz
rails-5861fde01fbe9446666b319dfc8d24514aafda21.tar.bz2
rails-5861fde01fbe9446666b319dfc8d24514aafda21.zip
Merge remote branch 'origin/master'
Diffstat (limited to 'actionpack/lib/action_view/helpers/csrf_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/csrf_helper.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/csrf_helper.rb b/actionpack/lib/action_view/helpers/csrf_helper.rb
index 41c6b67f91..3d03f6aac6 100644
--- a/actionpack/lib/action_view/helpers/csrf_helper.rb
+++ b/actionpack/lib/action_view/helpers/csrf_helper.rb
@@ -1,7 +1,9 @@
module ActionView
+ # = Action View CSRF Helper
module Helpers
module CsrfHelper
- # Returns a meta tag with the request forgery protection token for forms to use. Put this in your head.
+ # Returns a meta tag with the cross-site request forgery protection token
+ # for forms to use. Place this in your head.
def csrf_meta_tag
if protect_against_forgery?
%(<meta name="csrf-param" content="#{Rack::Utils.escape_html(request_forgery_protection_token)}"/>\n<meta name="csrf-token" content="#{Rack::Utils.escape_html(form_authenticity_token)}"/>).html_safe