diff options
author | José Valim <jose.valim@plataformatec.com.br> | 2012-06-30 09:37:36 -0700 |
---|---|---|
committer | José Valim <jose.valim@plataformatec.com.br> | 2012-06-30 09:37:36 -0700 |
commit | 350e9c6c170038a9241c96146302e82d9f74a6d2 (patch) | |
tree | a6a4c35c3ed6d24e0d423f38d188e6d243730f3e /actionpack/lib/abstract_controller/rendering.rb | |
parent | cca614bc37d00abd791c27c404682682ad73af59 (diff) | |
parent | 67dd94a77492faa0ab40d4596a12a70a96858cf4 (diff) | |
download | rails-350e9c6c170038a9241c96146302e82d9f74a6d2.tar.gz rails-350e9c6c170038a9241c96146302e82d9f74a6d2.tar.bz2 rails-350e9c6c170038a9241c96146302e82d9f74a6d2.zip |
Merge pull request #6908 from apotonick/av-prepare2
Av prepare2
Diffstat (limited to 'actionpack/lib/abstract_controller/rendering.rb')
-rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 7d73c6af8d..3da2834af0 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -49,9 +49,19 @@ module AbstractController module ClassMethods def view_context_class @view_context_class ||= begin - routes = _routes if respond_to?(:_routes) - helpers = _helpers if respond_to?(:_helpers) - ActionView::Base.prepare(routes, helpers) + routes = respond_to?(:_routes) && _routes + helpers = respond_to?(:_helpers) && _helpers + + Class.new(ActionView::Base) do + if routes + include routes.url_helpers + include routes.mounted_helpers + end + + if helpers + include helpers + end + end end end end |