aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/rendering.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/abstract_controller/rendering.rb')
-rw-r--r--actionpack/lib/abstract_controller/rendering.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 58d339d563..cde14916f2 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -49,6 +49,7 @@ module AbstractController
Class.new(ActionView::Base) do
if controller.respond_to?(:_helpers)
include controller._helpers
+ include controller._router.url_helpers
# TODO: Fix RJS to not require this
self.helpers = controller._helpers
end
@@ -63,6 +64,11 @@ module AbstractController
@view_context_class || self.class.view_context_class
end
+ def initialize(*)
+ @view_context_class = nil
+ super
+ end
+
# An instance of a view class. The default view class is ActionView::Base
#
# The view class must have the following methods: