From 0cb020b4d6d838025859bd60fb8151c8e21b8e84 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sat, 14 Feb 2009 18:22:41 -0600 Subject: workaround for picking layouts based on wrong view_paths [#1974 state:resolved] Signed-off-by: Joshua Peek --- actionpack/lib/action_controller/base.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'actionpack') diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 36b80d5780..def57a8dd3 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -885,6 +885,7 @@ module ActionController #:nodoc: 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 -- cgit v1.2.3