diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-12 05:51:02 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-12 05:51:02 +0000 |
| commit | 050c3964d8fe8d68c03fff593e3c09b5eae77a46 (patch) | |
| tree | 9331224443d2415be34543af3a94d415c7020d31 /actionpack/lib/action_controller/benchmarking.rb | |
| parent | 838ec413ebe08be71eea3dec0b061c6f609c839f (diff) | |
| download | rails-050c3964d8fe8d68c03fff593e3c09b5eae77a46.tar.gz rails-050c3964d8fe8d68c03fff593e3c09b5eae77a46.tar.bz2 rails-050c3964d8fe8d68c03fff593e3c09b5eae77a46.zip | |
Stopped the massive bleeding of concerns into ActionController::Base. Base no longer knows about flash, filters, or components. This may well have introduced some instability, please do test with apps, especially the ones using components. [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3580 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/benchmarking.rb')
| -rw-r--r-- | actionpack/lib/action_controller/benchmarking.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/benchmarking.rb b/actionpack/lib/action_controller/benchmarking.rb index eff4d97fae..a30212c8bd 100644 --- a/actionpack/lib/action_controller/benchmarking.rb +++ b/actionpack/lib/action_controller/benchmarking.rb @@ -4,9 +4,9 @@ module ActionController #:nodoc: # The benchmarking module times the performance of actions and reports to the logger. If the Active Record # package has been included, a separate timing section for database calls will be added as well. module Benchmarking #:nodoc: - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) + base.class_eval do alias_method :perform_action_without_benchmark, :perform_action alias_method :perform_action, :perform_action_with_benchmark |