mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
workaround for picking layouts based on wrong view_paths [#1974 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
This commit is contained in:
parent
b91d98011c
commit
0cb020b4d6
1 changed files with 1 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue