diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-03-19 11:09:41 -0700 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-03-19 11:11:02 -0700 |
| commit | 7f53dca1a13e21ec4400a765f637b73c0f194979 (patch) | |
| tree | a05523cc5568badb44340452e669b8f74cb5416f /actionpack | |
| parent | 562154fcbc8f36f94c986a3253c73ae88e2c1146 (diff) | |
| download | rails-7f53dca1a13e21ec4400a765f637b73c0f194979.tar.gz rails-7f53dca1a13e21ec4400a765f637b73c0f194979.tar.bz2 rails-7f53dca1a13e21ec4400a765f637b73c0f194979.zip | |
Fix protect_against_forgery
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index 6a3afbb157..2626a31fc2 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -52,7 +52,9 @@ module ActionController ac.stylesheets_dir = paths.public.stylesheets.to_a.first ac.secret = app.config.cookie_secret - ActionController.base_hook { self.config.replace(ac) } + ActionController.base_hook do + self.config.merge!(ac) + end end initializer "action_controller.initialize_framework_caches" do |