aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-04-26 01:08:07 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-04-26 01:08:07 +0000
commit15f06ea8c25b9570bb86a1b1b06ffe3d598b5710 (patch)
tree7c1e49bab690da68945de42962d5108987424466
parent9d08a07c48274686f8bd21e590249bfe3865df89 (diff)
downloadrails-15f06ea8c25b9570bb86a1b1b06ffe3d598b5710.tar.gz
rails-15f06ea8c25b9570bb86a1b1b06ffe3d598b5710.tar.bz2
rails-15f06ea8c25b9570bb86a1b1b06ffe3d598b5710.zip
XML values can be nil
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6582 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--activesupport/lib/active_support/core_ext/hash/conversions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index a8f2ec4452..e4103f1cb7 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -173,7 +173,7 @@ module ActiveSupport #:nodoc:
# Turn { :files => { :file => #<StringIO> } into { :files => #<StringIO> } so it is compatible with
# how multipart uploaded files from HTML appear
- if xml_value["file"].is_a?(StringIO)
+ if xml_value && xml_value["file"].is_a?(StringIO)
xml_value["file"]
else
xml_value