diff options
| author | Jon Moss <me@jonathanmoss.me> | 2016-04-20 19:47:16 -0400 |
|---|---|---|
| committer | Jon Moss <me@jonathanmoss.me> | 2016-04-20 19:47:16 -0400 |
| commit | 7bd2f9177342c57a81880425ab134945aea6fbd9 (patch) | |
| tree | cce2c3d9891763a4cdfd3fd0b5e63c152e7eede9 /actionpack/lib | |
| parent | 115efeb036d4d56186ba7b0b64750cdc57471b59 (diff) | |
| download | rails-7bd2f9177342c57a81880425ab134945aea6fbd9.tar.gz rails-7bd2f9177342c57a81880425ab134945aea6fbd9.tar.bz2 rails-7bd2f9177342c57a81880425ab134945aea6fbd9.zip | |
Fix ApplicationController.renderer.defaults.merge!
Previously, users were trying to modify a frozen Hash. Includes a
regression test :)
Fixes #22975
Diffstat (limited to 'actionpack/lib')
| -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 e4d19e9dba..2775a24e56 100644 --- a/actionpack/lib/action_controller/renderer.rb +++ b/actionpack/lib/action_controller/renderer.rb @@ -45,7 +45,7 @@ module ActionController }.freeze # Create a new renderer instance for a specific controller class. - def self.for(controller, env = {}, defaults = DEFAULTS) + def self.for(controller, env = {}, defaults = DEFAULTS.dup) new(controller, env, defaults) end |