diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-01-13 13:28:14 -0800 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-01-13 13:28:28 -0800 |
commit | 0932b012fae2ff21214f610a0fd78a55ae4e2420 (patch) | |
tree | 82b521a5ddf17c3bc4fd7762c95d49f29d31de15 /actionpack/lib/action_controller/session/cookie_store.rb | |
parent | 6fe739ad752aeeaaf274ced6111685d2d6ed2eb8 (diff) | |
parent | 5a43908c7414996354ca427354d98d789e0210e7 (diff) | |
download | rails-0932b012fae2ff21214f610a0fd78a55ae4e2420.tar.gz rails-0932b012fae2ff21214f610a0fd78a55ae4e2420.tar.bz2 rails-0932b012fae2ff21214f610a0fd78a55ae4e2420.zip |
Sync 'rails/rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/session/cookie_store.rb')
-rw-r--r-- | actionpack/lib/action_controller/session/cookie_store.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/session/cookie_store.rb b/actionpack/lib/action_controller/session/cookie_store.rb index 135bedaf50..e061c4d4a1 100644 --- a/actionpack/lib/action_controller/session/cookie_store.rb +++ b/actionpack/lib/action_controller/session/cookie_store.rb @@ -163,9 +163,9 @@ module ActionController def ensure_session_key(key) if key.blank? - raise ArgumentError, 'A session_key is required to write a ' + + raise ArgumentError, 'A key is required to write a ' + 'cookie containing the session data. Use ' + - 'config.action_controller.session = { :session_key => ' + + 'config.action_controller.session = { :key => ' + '"_myapp_session", :secret => "some secret phrase" } in ' + 'config/environment.rb' end @@ -181,7 +181,7 @@ module ActionController if secret.blank? raise ArgumentError, "A secret is required to generate an " + "integrity hash for cookie session data. Use " + - "config.action_controller.session = { :session_key => " + + "config.action_controller.session = { :key => " + "\"_myapp_session\", :secret => \"some secret phrase of at " + "least #{SECRET_MIN_LENGTH} characters\" } " + "in config/environment.rb" |