Make sure render :update support the options hash. Closes #11088 [ernesto.jimenez]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8862 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 3 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb
index 0fbbfa8b05..e1853ad131 100644
--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -243,7 +243,7 @@ module ActionController #:nodoc:
     end
 
     protected
-      def render_with_a_layout(options = nil, &block) #:nodoc:
+      def render_with_a_layout(options = nil, extra_options = {}, &block) #:nodoc:
         template_with_options = options.is_a?(Hash)
         
         if apply_layout?(template_with_options, options) && (layout = pick_layout(template_with_options, options))
@@ -252,7 +252,7 @@ module ActionController #:nodoc:
           options = options.merge :layout => false if template_with_options
           logger.info("Rendering template within #{layout}") if logger
 
-          content_for_layout = render_with_no_layout(options, &block)
+          content_for_layout = render_with_no_layout(options, extra_options, &block)
           erase_render_results
           add_variables_to_assigns
           @template.instance_variable_set("@content_for_layout", content_for_layout)
@@ -260,7 +260,7 @@ module ActionController #:nodoc:
           status = template_with_options ? options[:status] : nil
           render_for_text(@template.render_file(layout, true), status)
         else
-          render_with_no_layout(options, &block)
+          render_with_no_layout(options, extra_options, &block)
         end
       end