From 14c378cc7fd364ea5d96e13746345a29341cd845 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Wed, 15 Jun 2005 13:20:17 +0000 Subject: 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 --- actionpack/lib/action_controller/layout.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_controller/layout.rb') 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) -- cgit v1.2.3