diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2009-02-14 18:22:41 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-02-14 18:22:41 -0600 |
| commit | 0cb020b4d6d838025859bd60fb8151c8e21b8e84 (patch) | |
| tree | eb02d6cb2a9b943aa495c772c9700e28ac7cc746 /actionpack | |
| parent | b91d98011ce4cb364dcaa9caecd571eb2c697659 (diff) | |
| download | rails-0cb020b4d6d838025859bd60fb8151c8e21b8e84.tar.gz rails-0cb020b4d6d838025859bd60fb8151c8e21b8e84.tar.bz2 rails-0cb020b4d6d838025859bd60fb8151c8e21b8e84.zip | |
workaround for picking layouts based on wrong view_paths [#1974 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |