diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-12 16:13:00 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-12 16:13:00 -0300 |
| commit | 0048897a417774f7e5a0c8c9e82fc8684f94ebc1 (patch) | |
| tree | 8df248dab434bdaac61ea60249d4630958260eed /actionpack/lib/action_controller/dispatch/dispatcher.rb | |
| parent | 6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5 (diff) | |
| parent | 22c5667c2ef46d6723c1805d3adc52dc8e92429b (diff) | |
| download | rails-0048897a417774f7e5a0c8c9e82fc8684f94ebc1.tar.gz rails-0048897a417774f7e5a0c8c9e82fc8684f94ebc1.tar.bz2 rails-0048897a417774f7e5a0c8c9e82fc8684f94ebc1.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/dispatch/dispatcher.rb')
| -rw-r--r-- | actionpack/lib/action_controller/dispatch/dispatcher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb index cce3b6175d..63866caed9 100644 --- a/actionpack/lib/action_controller/dispatch/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatch/dispatcher.rb @@ -48,7 +48,7 @@ module ActionController cattr_accessor :middleware self.middleware = ActionDispatch::MiddlewareStack.new do |middleware| middlewares = File.join(File.dirname(__FILE__), "middlewares.rb") - middleware.instance_eval(File.read(middlewares)) + middleware.instance_eval(File.read(middlewares), middlewares, 1) end include ActiveSupport::Callbacks |