aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-03-18 22:55:44 -0700
committerwycats <wycats@gmail.com>2010-03-18 22:55:44 -0700
commit0aa0c37b59077d3f8b0d43c4d5faf86d40949f5f (patch)
tree433c37396f23453f836d563257e10a09e84bf743 /actionpack
parent995f57033f5a36d9ddd3aa65f0f01cccbb6baf6e (diff)
downloadrails-0aa0c37b59077d3f8b0d43c4d5faf86d40949f5f.tar.gz
rails-0aa0c37b59077d3f8b0d43c4d5faf86d40949f5f.tar.bz2
rails-0aa0c37b59077d3f8b0d43c4d5faf86d40949f5f.zip
Well that was a bust
Diffstat (limited to 'actionpack')
-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