diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-22 17:31:29 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-22 17:31:29 -0800 |
| commit | e7ef57dd0ddec3d487d3ffd58ff028bdf11a33f9 (patch) | |
| tree | dfc9e049c937a56c2fc1e80ae8e8b71880d1615d /actionpack/lib/action_controller/base.rb | |
| parent | ec095456d859da4a09c7401585c211dc0f01fccd (diff) | |
| parent | f737c2d69bb3659a553c7c0e21e316b1a4a1b98a (diff) | |
| download | rails-e7ef57dd0ddec3d487d3ffd58ff028bdf11a33f9.tar.gz rails-e7ef57dd0ddec3d487d3ffd58ff028bdf11a33f9.tar.bz2 rails-e7ef57dd0ddec3d487d3ffd58ff028bdf11a33f9.zip | |
Merge
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 452f0cd4f0..dbba69f637 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -14,6 +14,7 @@ module ActionController include ActionController::Layouts include ActionController::ConditionalGet include ActionController::RackDelegation + include ActionController::Logger include ActionController::Benchmarking include ActionController::Configuration @@ -89,7 +90,7 @@ module ActionController end if options[:status] - options[:status] = ActionDispatch::StatusCodes[options[:status]] + options[:status] = Rack::Utils.status_code(options[:status]) end options[:update] = blk if block_given? |