From 562a00ba16746bf36b7d8b327fabae3dabfdb122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 4 Jan 2010 22:11:35 +0100 Subject: @_formats initialization should be AbstractController::Base. --- actionpack/lib/abstract_controller/base.rb | 5 +++++ actionpack/lib/abstract_controller/rendering.rb | 6 ------ actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index a6889d5d01..48725ad82a 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -86,6 +86,11 @@ module AbstractController abstract! + # Initialize controller with nil formats. + def initialize #:nodoc: + @_formats = nil + end + # Calls the action going through the entire action dispatch stack. # # The actual method that is called is determined by calling diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 332d86b089..d57136dbb8 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -17,12 +17,6 @@ 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: diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb index af356707c6..10f04dcdf6 100644 --- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb +++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb @@ -14,7 +14,7 @@ module ActionDispatch # ExceptionNotifier.deliver_exception(start, payload) # end # - # The payload is a hash which has to pairs: + # The payload is a hash which has two pairs: # # * :env - Contains the rack env for the given request; # * :exception - The exception raised; -- cgit v1.2.3