diff options
| author | José Valim <jose.valim@gmail.com> | 2010-02-01 11:41:16 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-02-01 11:41:16 +0100 |
| commit | 66615f25cf30835968f5c4798c5befea0d357e89 (patch) | |
| tree | e364f1340b605b861c688384914518e4964f8d17 /actionpack/lib/action_controller/metal.rb | |
| parent | 0dece7929cf5b04f008640936fb3ece24ce80daa (diff) | |
| parent | e5ab4b0d07ade8d89d633ca744c0eafbc53ee921 (diff) | |
| download | rails-66615f25cf30835968f5c4798c5befea0d357e89.tar.gz rails-66615f25cf30835968f5c4798c5befea0d357e89.tar.bz2 rails-66615f25cf30835968f5c4798c5befea0d357e89.zip | |
Merge branch 'master' of gitproxy:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/metal.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index 57627a6f0b..2b35e111ec 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -1,4 +1,4 @@ -require 'active_support/core_ext/class/inheritable_attributes' +require 'active_support/core_ext/class/attribute' module ActionController # ActionController::Metal provides a way to get a valid Rack application from a controller. @@ -90,7 +90,12 @@ module ActionController end end - extlib_inheritable_accessor(:middleware_stack) { ActionDispatch::MiddlewareStack.new } + class_attribute :middleware_stack + self.middleware_stack = ActionDispatch::MiddlewareStack.new + + def self.inherited(base) + self.middleware_stack = base.middleware_stack.dup + end def self.use(*args) middleware_stack.use(*args) |