diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-09-14 16:25:48 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-09-14 16:25:48 -0700 |
| commit | 2f0bc1f78975ecaae10f845c7d63928e748dd6a6 (patch) | |
| tree | a6f293f98fd16ee636f8dac94954e0a28ba6affa /actionpack | |
| parent | 5e3e5de48b2659afd09361ed34e592e54988e478 (diff) | |
| download | rails-2f0bc1f78975ecaae10f845c7d63928e748dd6a6.tar.gz rails-2f0bc1f78975ecaae10f845c7d63928e748dd6a6.tar.bz2 rails-2f0bc1f78975ecaae10f845c7d63928e748dd6a6.zip | |
only "normalize" once
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/renderer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |