Permalink
Browse files

Dont pass controller partial layout option to view

  • Loading branch information...
lifo committed Aug 30, 2008
1 parent afea4c9 commit e12abb6e8a454775c31ec9e282d5abf9246a9e4a
Showing with 2 additions and 2 deletions.
  1. +1 −1 actionpack/lib/action_controller/base.rb
  2. +1 −1 actionpack/lib/action_controller/layout.rb
@@ -897,7 +897,7 @@ def render(options = nil, extra_options = {}, &block) #:doc:
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
@@ -245,7 +245,7 @@ def render_with_a_layout(options = nil, extra_options = {}, &block) #: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)

0 comments on commit e12abb6

Please sign in to comment.