diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-09-21 14:57:24 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-09-21 14:57:24 -0300 |
| commit | a294d8362bfb62b7133ad0799ae1327cd5ddd1e4 (patch) | |
| tree | 477930041d5c42f2453178ab110c8455c6d702fe /activeresource/lib | |
| parent | 378b02d3aa890cedabf1ef81c34a371dbbc52c25 (diff) | |
| parent | e2d0b0ee61c5a8c2626abb5ac1029b48ec1965eb (diff) | |
| download | rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.tar.gz rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.tar.bz2 rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activeresource/lib')
| -rw-r--r-- | activeresource/lib/active_resource/validations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activeresource/lib/active_resource/validations.rb b/activeresource/lib/active_resource/validations.rb index d4d282e273..67b69fa505 100644 --- a/activeresource/lib/active_resource/validations.rb +++ b/activeresource/lib/active_resource/validations.rb @@ -93,9 +93,9 @@ module ActiveResource # content-type of the error-block received def load_remote_errors(remote_errors, save_cache = false ) #:nodoc: case remote_errors.response['Content-Type'] - when 'application/xml' + when /xml/ errors.from_xml(remote_errors.response.body, save_cache) - when 'application/json' + when /json/ errors.from_json(remote_errors.response.body, save_cache) end end |