aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authoralpaca-tc <alpaca-tc@alpaca.tc>2017-03-08 18:54:52 +0900
committeralpaca-tc <alpaca-tc@alpaca.tc>2017-03-12 22:38:20 +0900
commitc5f8fe9379dc144a54ceb5663aa449d35d1bf405 (patch)
tree2fff48e6333d01bf8cc149b837b8e4971e971235 /actionpack/lib/action_controller
parent4cb8cbd80b0bfedc0fb7033c9f5c41a65312b644 (diff)
downloadrails-c5f8fe9379dc144a54ceb5663aa449d35d1bf405.tar.gz
rails-c5f8fe9379dc144a54ceb5663aa449d35d1bf405.tar.bz2
rails-c5f8fe9379dc144a54ceb5663aa449d35d1bf405.zip
Fixes ActionController::Rendering#with_defaults
`env` is undefined.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/renderer.rb2
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.