workaround for picking layouts based on wrong view_paths [#1974 state…

…:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
rails · Feb 15, 2009 · 0cb020b · 0cb020b
1 parent b91d980
commit 0cb020b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
@@ -885,6 +885,7 @@ def render(options = nil, extra_options = {}, &block) #:doc:
         layout = pick_layout(options)
         response.layout = layout.path_without_format_and_extension if layout
         logger.info("Rendering template within #{layout.path_without_format_and_extension}") if logger && layout
+        layout = layout.path_without_format_and_extension if layout
 
         if content_type = options[:content_type]
           response.content_type = content_type.to_s