diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-19 13:40:26 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-19 13:40:26 +0530 |
| commit | c71120e29caddda295c133adfb279870733a3f81 (patch) | |
| tree | da81981de36bc146c36cae3bc73cb5020ba05919 /actionpack/lib/action_controller/deprecated | |
| parent | 087b67805e3785159cb4da524ad37782bd182b93 (diff) | |
| parent | 71d67fc6bd504956bce66e274e6228dd00a814c1 (diff) | |
| download | rails-c71120e29caddda295c133adfb279870733a3f81.tar.gz rails-c71120e29caddda295c133adfb279870733a3f81.tar.bz2 rails-c71120e29caddda295c133adfb279870733a3f81.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/deprecated')
| -rw-r--r-- | actionpack/lib/action_controller/deprecated/dispatcher.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/deprecated/dispatcher.rb b/actionpack/lib/action_controller/deprecated/dispatcher.rb index 3da3c8ce7d..8c21e375dd 100644 --- a/actionpack/lib/action_controller/deprecated/dispatcher.rb +++ b/actionpack/lib/action_controller/deprecated/dispatcher.rb @@ -1,8 +1,5 @@ module ActionController class Dispatcher - cattr_accessor :prepare_each_request - self.prepare_each_request = false - class << self def before_dispatch(*args, &block) ActiveSupport::Deprecation.warn "ActionController::Dispatcher.before_dispatch is deprecated. " << @@ -18,7 +15,7 @@ module ActionController def to_prepare(*args, &block) ActiveSupport::Deprecation.warn "ActionController::Dispatcher.to_prepare is deprecated. " << - "Please use ActionDispatch::Callbacks.to_prepare instead.", caller + "Please use config.to_prepare instead", caller ActionDispatch::Callbacks.after(*args, &block) end |