From b7f37d3ef99c512f02f0579836f573fa3beb7bb3 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 2 Jul 2005 18:49:17 +0000 Subject: Fixed a bug with alternate layout #1468 [sam] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/scaffolding.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/scaffolding.rb') diff --git a/actionpack/lib/action_controller/scaffolding.rb b/actionpack/lib/action_controller/scaffolding.rb index 8108bf6956..3d7223bedb 100644 --- a/actionpack/lib/action_controller/scaffolding.rb +++ b/actionpack/lib/action_controller/scaffolding.rb @@ -157,7 +157,7 @@ module ActionController @content_for_layout = @template.render_file(scaffold_path(action.sub(/#{suffix}$/, "")), false) - if active_layout? + if !active_layout.nil? render :file => active_layout, :use_full_path => true else render :file => scaffold_path("layout") -- cgit v1.2.3