Merge branch 'master' into docrails

2 files changed, 27 insertions, 12 deletions

diff --git a/actionpack/lib/action_view/render/layouts.rb b/actionpack/lib/action_view/render/layouts.rb
index 11ff05ce5b..578f39d817 100644
--- a/actionpack/lib/action_view/render/layouts.rb
+++ b/actionpack/lib/action_view/render/layouts.rb
@@ -43,10 +43,16 @@ module ActionView
     # This is the method which actually finds the layout using details in the lookup
     # context object. If no layout is found, it checkes if at least a layout with
     # the given name exists across all details before raising the error.
-    def find_layout(layout) #:nodoc:
+    #
+    # If self.formats contains several formats, just the first one is considered in
+    # the layout lookup.
+    def find_layout(layout)
       begin
-        layout =~ /^\// ?
-          with_fallbacks { find_template(layout) } : find_template(layout)
+        if formats.size == 1
+          _find_layout(layout)
+        else
+          update_details(:formats => self.formats.first){ _find_layout(layout) }
+        end
       rescue ActionView::MissingTemplate => e
         update_details(:formats => nil) do
           raise unless template_exists?(layout)
@@ -54,6 +60,11 @@ module ActionView
       end
     end
 
+    def _find_layout(layout) #:nodoc:
+      layout =~ /^\// ?
+        with_fallbacks { find_template(layout) } : find_template(layout)
+    end
+
     # Contains the logic that actually renders the layout.
     def _render_layout(layout, locals, &block) #:nodoc:
       layout.render(self, locals){ |*name| _layout_for(*name, &block) }
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index 310efe40e2..a8f745afd1 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -16,13 +16,12 @@ module ActionView
       case options
       when Hash
         if block_given?
-          content = _render_partial(options.merge(:partial => options[:layout]), &block)
-          safe_concat(content)
+          _render_partial(options.merge(:partial => options[:layout]), &block)
         elsif options.key?(:partial)
           _render_partial(options)
         else
           template = _determine_template(options)
-          self.formats = template.formats
+          _freeze_formats(template.formats)
           _render_template(template, options[:layout], options)
         end
       when :update
@@ -54,18 +53,23 @@ module ActionView
       layout = find_layout(layout) if layout
 
       ActiveSupport::Notifications.instrument("action_view.render_template",
-        :identifier => template.identifier, :layout => layout.try(:identifier)) do
+        :identifier => template.identifier, :layout => layout.try(:virtual_path)) do
 
         content = template.render(self, locals) { |*name| _layout_for(*name) }
         @_content_for[:layout] = content
 
-        if layout
-          @_layout = layout.identifier
-          content  = _render_layout(layout, locals)
-        end
-
+        content = _render_layout(layout, locals) if layout
         content
       end
     end
+
+    # Freeze the current formats in the lookup context. By freezing them, you are guaranteeing
+    # that next template lookups are not going to modify the formats. The controller can also
+    # use this, to ensure that formats won't be further modified (as it does in respond_to blocks).
+    def _freeze_formats(formats) #:nodoc:
+      return if self.formats.frozen?
+      self.formats = formats
+      self.formats.freeze
+    end
   end
 end