diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2017-03-13 19:22:03 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-13 19:22:03 +0900 |
| commit | 11f10840936a323eda1a9eab02521eff9bdccedb (patch) | |
| tree | 989a99cba718bda0583cb512a35927d45f05161f /actionpack/lib | |
| parent | 097612e8f5bc520bbcdd3c9134a3421eac4d624a (diff) | |
| parent | c5f8fe9379dc144a54ceb5663aa449d35d1bf405 (diff) | |
| download | rails-11f10840936a323eda1a9eab02521eff9bdccedb.tar.gz rails-11f10840936a323eda1a9eab02521eff9bdccedb.tar.bz2 rails-11f10840936a323eda1a9eab02521eff9bdccedb.zip | |
Merge pull request #28352 from alpaca-tc/fixes_renderer_with_defaults
Fixes ActionController::Rendering#with_defaults
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 e1441bd343..3d2edb5242 100644 --- a/actionpack/lib/action_controller/renderer.rb +++ b/actionpack/lib/action_controller/renderer.rb @@ -56,7 +56,7 @@ module ActionController # Create a new renderer for the same controller but with new defaults. def with_defaults(defaults) - self.class.new controller, env, self.defaults.merge(defaults) + self.class.new controller, @env, self.defaults.merge(defaults) end # Accepts a custom Rack environment to render templates in. |