diff options
| author | Luke Amdor <luke@absoluterubbish.net> | 2009-04-27 11:30:08 -0500 |
|---|---|---|
| committer | Luke Amdor <luke@absoluterubbish.net> | 2009-04-27 12:38:14 -0500 |
| commit | 4df9680a6fe6608e8a82924f52e51a028a8575e5 (patch) | |
| tree | 4ade6e5fd2e9fb7f7408082fff8e0748bdd23b1d /actionpack | |
| parent | ba84025eb47c8a45846f410bed794414f68edbad (diff) | |
| download | rails-4df9680a6fe6608e8a82924f52e51a028a8575e5.tar.gz rails-4df9680a6fe6608e8a82924f52e51a028a8575e5.tar.bz2 rails-4df9680a6fe6608e8a82924f52e51a028a8575e5.zip | |
Removed reference in documentation of form_authenticity_token to deprecated :secret option of protect_from_forgery
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/base/request_forgery_protection.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base/request_forgery_protection.rb b/actionpack/lib/action_controller/base/request_forgery_protection.rb index 3067122ceb..df91dc1006 100644 --- a/actionpack/lib/action_controller/base/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/base/request_forgery_protection.rb @@ -96,8 +96,7 @@ module ActionController #:nodoc: !request.content_type.nil? && request.content_type.verify_request? end - # Sets the token value for the current session. Pass a <tt>:secret</tt> option - # in +protect_from_forgery+ to add a custom salt to the hash. + # Sets the token value for the current session. def form_authenticity_token session[:_csrf_token] ||= ActiveSupport::SecureRandom.base64(32) end |