Merge commit 'origin/master' into mail

2 files changed, 7 insertions, 1 deletions

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index 1616f8030a..c71cef42b2 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -100,7 +100,7 @@ module AbstractController
       # name, return that string. Otherwise, use the superclass'
       # layout (which might also be implied)
       def _write_layout_method
-        case @_layout
+        case defined?(@_layout) ? @_layout : nil
         when String
           self.class_eval %{def _layout(details) #{@_layout.inspect} end}
         when Symbol
diff --git a/actionpack/lib/abstract_controller/rendering_controller.rb b/actionpack/lib/abstract_controller/rendering_controller.rb
index 0aae2b18e9..7054b9cf26 100644
--- a/actionpack/lib/abstract_controller/rendering_controller.rb
+++ b/actionpack/lib/abstract_controller/rendering_controller.rb
@@ -12,6 +12,12 @@ module AbstractController
       self._view_paths ||= ActionView::PathSet.new
     end
 
+    # Initialize controller with nil formats.
+    def initialize(*) #:nodoc:
+      @_formats = nil
+      super
+    end
+
     # An instance of a view class. The default view class is ActionView::Base
     #
     # The view class must have the following methods: