diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-06-15 13:20:17 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-06-15 13:20:17 +0000 |
| commit | 14c378cc7fd364ea5d96e13746345a29341cd845 (patch) | |
| tree | 6b302c43fec40f5ca9a3f72e75b411338eaec53a /actionpack/lib/action_controller/layout.rb | |
| parent | 280c224b43f8a8d42ebfbe104e94d3895972856d (diff) | |
| download | rails-14c378cc7fd364ea5d96e13746345a29341cd845.tar.gz rails-14c378cc7fd364ea5d96e13746345a29341cd845.tar.bz2 rails-14c378cc7fd364ea5d96e13746345a29341cd845.zip | |
render(:template) applies a layout by default. render("foo/bar") works with a layout again.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1424 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 237e274173..0494ebc456 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -219,8 +219,8 @@ module ActionController #:nodoc: private def render_with_a_layout_options(options) - return options unless options.is_a?(Hash) - if options.values_at(:text, :file, :template, :inline, :partial, :nothing).compact.empty? + return { :template => options } unless options.is_a?(Hash) + if options.values_at(:text, :file, :inline, :partial, :nothing).compact.empty? options else { :layout => false }.merge(options) |