lib/action_view/render/rendering.rb in actionpack-3.0.0.beta4 vs lib/action_view/render/rendering.rb in actionpack-3.0.0.rc

@@ -1,8 +1,9 @@
 require 'active_support/core_ext/object/try'
 
 module ActionView
+  # = Action View Rendering
   module Rendering
     # Returns the result of a render that's dictated by the options hash. The primary options are:
     #
     # * <tt>:partial</tt> - See ActionView::Partials.
     # * <tt>:update</tt> - Calls update_page with the block given.
@@ -54,10 +55,10 @@
 
       ActiveSupport::Notifications.instrument("render_template.action_view",
         :identifier => template.identifier, :layout => layout.try(:virtual_path)) do
 
         content = template.render(self, locals) { |*name| _layout_for(*name) }
-        @_content_for[:layout] = content
+        @_content_for[:layout] = content if layout
 
         content = _render_layout(layout, locals) if layout
         content
       end
     end