diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-04 08:37:59 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-04 08:37:59 +0200 |
| commit | 4758d37044ac7a938c8b1dbd90470410a0566491 (patch) | |
| tree | 3a3aedaec37ea8ef02b6e99f104b4f1fc2f721e7 /actionpack/lib/action_view/base.rb | |
| parent | bff374050d5a7e237fda98a1d4cc6256484e94f2 (diff) | |
| parent | eb327c1bab918c7d9ab723550f767529771d2e19 (diff) | |
| download | rails-4758d37044ac7a938c8b1dbd90470410a0566491.tar.gz rails-4758d37044ac7a938c8b1dbd90470410a0566491.tar.bz2 rails-4758d37044ac7a938c8b1dbd90470410a0566491.zip | |
Merge remote branch 'apotonick/presentation'
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index ca0a89c8a5..db3c83d028 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -199,8 +199,9 @@ module ActionView #:nodoc: elsif lookup_context = context.is_a?(ActionView::LookupContext) ? context : ActionView::LookupContext.new(context) - lookup_context.formats = formats if formats - @view_renderer = ActionView::Renderer.new(lookup_context, controller) + lookup_context.formats = formats if formats + lookup_context.prefixes = controller._prefixes if controller + @view_renderer = ActionView::Renderer.new(lookup_context) end _prepare_context |