Permalink
Browse files

Fixed a bug with alternate layout #1468 [sam]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent c6ab8f5 commit b7f37d3ef99c512f02f0579836f573fa3beb7bb3 @dhh dhh committed Jul 2, 2005
Showing with 1 addition and 1 deletion.
  1. +1 −1 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")

0 comments on commit b7f37d3

Please sign in to comment.