github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-25 06:18:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug with alternate layout #1468 [sam]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-07-02 18:49:17 +00:00
parent c6ab8f5706
commit b7f37d3ef9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_controller/scaffolding.rb
View File

@@ -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")