diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-26 11:34:02 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-26 11:34:02 -0300 |
| commit | b3d40546923b194a89be0d9e00758864fa60b9e8 (patch) | |
| tree | 8acac475b371d61924c67a439704c82c61968fff /actionpack/lib/action_controller/new_base/conditional_get.rb | |
| parent | aa5512299041efb923cd582fd26009a72b9ec670 (diff) | |
| parent | 2f59066470193c6219dfd958fc5d8096a2ddee68 (diff) | |
| download | rails-b3d40546923b194a89be0d9e00758864fa60b9e8.tar.gz rails-b3d40546923b194a89be0d9e00758864fa60b9e8.tar.bz2 rails-b3d40546923b194a89be0d9e00758864fa60b9e8.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/new_base/conditional_get.rb')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/conditional_get.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/new_base/conditional_get.rb b/actionpack/lib/action_controller/new_base/conditional_get.rb index e1407e671a..116ce34494 100644 --- a/actionpack/lib/action_controller/new_base/conditional_get.rb +++ b/actionpack/lib/action_controller/new_base/conditional_get.rb @@ -57,7 +57,7 @@ module ActionController raise ArgumentError, "too few arguments to head" end options = args.extract_options! - status = interpret_status(args.shift || options.delete(:status) || :ok) + status = args.shift || options.delete(:status) || :ok options.each do |key, value| headers[key.to_s.dasherize.split(/-/).map { |v| v.capitalize }.join("-")] = value.to_s |