diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-02 18:49:17 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-02 18:49:17 +0000 |
| commit | b7f37d3ef99c512f02f0579836f573fa3beb7bb3 (patch) | |
| tree | 2c3482147728e1e875eec0712e59a8c37bf3b4b1 /actionpack/lib/action_controller | |
| parent | c6ab8f5706a64d30281666e73b0b432dc777aa01 (diff) | |
| download | rails-b7f37d3ef99c512f02f0579836f573fa3beb7bb3.tar.gz rails-b7f37d3ef99c512f02f0579836f573fa3beb7bb3.tar.bz2 rails-b7f37d3ef99c512f02f0579836f573fa3beb7bb3.zip | |
Fixed a bug with alternate layout #1468 [sam]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/scaffolding.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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") |