Permalink
Browse files

Attempt at fixing the preparation_callbacks, nzkoz will double check

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5794 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent d88e83f commit 014fdde93a7ebdcea79d27667c4a89c65e81cc6b @dhh dhh committed Dec 27, 2006
Showing with 2 additions and 8 deletions.
  1. +2 −8 railties/lib/dispatcher.rb
@@ -25,9 +25,7 @@
# to the appropriate controller and action. It also takes care of resetting
# the environment (when Dependencies.load? is true) after each request.
class Dispatcher
-
class << self
-
# Dispatch the given CGI request, using the given session options, and
# emitting the output via the given output. If you dispatch with your
# own CGI object be sure to handle the exceptions it raises on multipart
@@ -89,8 +87,8 @@ def to_prepare(identifier = nil, &block)
end
private
-
- attr_accessor :preparation_callbacks, :preparation_callbacks_run
+ attr_accessor_with_default :preparation_callbacks, []
+ attr_accessor_with_default :preparation_callbacks_run, false
alias_method :preparation_callbacks_run?, :preparation_callbacks_run
# CGI.new plus exception handling. CGI#read_multipart raises EOFError
@@ -162,10 +160,6 @@ def failsafe_response(output, status, exception = nil)
end
end
end
-
- self.preparation_callbacks ||= []
- self.preparation_callbacks_run = false
-
end
Dispatcher.to_prepare :activerecord_instantiate_observers do

0 comments on commit 014fdde

Please sign in to comment.