Merge remote branch 'apotonick/presentation'

2 files changed, 6 insertions, 3 deletions

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 7f1a790ecc..8789168ca7 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -104,7 +104,7 @@ module AbstractController
 
     # Returns an object that is able to render templates.
     def view_renderer
-      @view_renderer ||= ActionView::Renderer.new(lookup_context, self)
+      @view_renderer ||= ActionView::Renderer.new(lookup_context)
     end
 
     # Normalize arguments, options and then delegates render_to_body and
diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
index cea0f5ad1e..4fdca2cc5c 100644
--- a/actionpack/lib/abstract_controller/view_paths.rb
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -15,7 +15,10 @@ module AbstractController
     # templates, i.e. view paths and details. Check ActionView::LookupContext for more
     # information.
     def lookup_context
-      @lookup_context ||= ActionView::LookupContext.new(self.class._view_paths, details_for_lookup)
+      @lookup_context ||=
+        ActionView::LookupContext.new(self.class._view_paths, details_for_lookup).tap do |ctx|
+          ctx.prefixes = _prefixes
+      end
     end
 
     def details_for_lookup
@@ -67,4 +70,4 @@ module AbstractController
       end
     end
   end
-end
\ No newline at end of file
+end