aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/scaffolding.rb2
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")