From 7f53dca1a13e21ec4400a765f637b73c0f194979 Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Fri, 19 Mar 2010 11:09:41 -0700 Subject: Fix protect_against_forgery --- actionpack/lib/action_controller/railtie.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/railtie.rb') 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 -- cgit v1.2.3