aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-08-30 15:49:56 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-08-30 15:49:56 -0700
commitf7d9e09eeec0ff24d19dfcf926555c58918b1bcc (patch)
treef4fd883612e90b4b684672e2428f0ddbf0496a62 /actionpack/lib/action_controller
parentb163d83b8bab9103dc0e73b86212c2629cb45ca2 (diff)
parent4fb75392aa12228764758dfda95f02f83b8ce3fe (diff)
downloadrails-f7d9e09eeec0ff24d19dfcf926555c58918b1bcc.tar.gz
rails-f7d9e09eeec0ff24d19dfcf926555c58918b1bcc.tar.bz2
rails-f7d9e09eeec0ff24d19dfcf926555c58918b1bcc.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/base.rb2
-rw-r--r--actionpack/lib/action_controller/layout.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 3b0f19475e..a1b210a54f 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -897,7 +897,7 @@ module ActionController #:nodoc:
render_for_text(@template.render(options), options[:status])
elsif action_name = options[:action]
- render_for_file(default_template_name(action_name.to_s), options[:status], nil, options[:locals] || {})
+ render_for_file(default_template_name(action_name.to_s), options[:status])
elsif xml = options[:xml]
response.content_type ||= Mime::XML
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb
index 8b6febe254..fd743ced38 100644
--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -245,7 +245,7 @@ module ActionController #:nodoc:
template_with_options = options.is_a?(Hash)
if (layout = pick_layout(template_with_options, options)) && apply_layout?(template_with_options, options)
- options = options.merge :layout => false if template_with_options
+ options.delete(:layout) if template_with_options
logger.info("Rendering template within #{layout}") if logger
content_for_layout = render_with_no_layout(options, extra_options, &block)