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

@@ -157,7 +157,7 @@ def render#{suffix}_scaffold(action = caller_method_name(caller))
 
                 @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")