aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/abstract_controller/rendering.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index cde14916f2..b251bd6405 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -49,7 +49,11 @@ module AbstractController
Class.new(ActionView::Base) do
if controller.respond_to?(:_helpers)
include controller._helpers
- include controller._router.url_helpers
+
+ if controller.respond_to?(:_router)
+ include controller._router.url_helpers
+ end
+
# TODO: Fix RJS to not require this
self.helpers = controller._helpers
end