From 2f0bc1f78975ecaae10f845c7d63928e748dd6a6 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 14 Sep 2015 16:25:48 -0700 Subject: only "normalize" once --- actionpack/lib/action_controller/renderer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/renderer.rb b/actionpack/lib/action_controller/renderer.rb index cacfb33c40..2a8b19b7ca 100644 --- a/actionpack/lib/action_controller/renderer.rb +++ b/actionpack/lib/action_controller/renderer.rb @@ -64,7 +64,7 @@ module ActionController def initialize(controller, env, defaults) @controller = controller @defaults = defaults - @env = normalize_keys(defaults).merge normalize_keys(env) + @env = normalize_keys defaults.merge(env) @env['action_dispatch.routes'] = controller._routes end -- cgit v1.2.3