diff options
| author | José Valim <jose.valim@gmail.com> | 2011-07-11 04:28:00 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-07-11 04:28:00 -0700 |
| commit | e9f9ce971e17bcdc0cf74af926fdeacea56504a3 (patch) | |
| tree | 9b9185e2443b107b3c4ccc6523e1cc55c6a5723c /activesupport/lib | |
| parent | 871d7fad03b2c74edc8b853b9c350aa9f9d24a3d (diff) | |
| parent | 83555a539891d18c37e788ebd5bdc819d4cfe7f5 (diff) | |
| download | rails-e9f9ce971e17bcdc0cf74af926fdeacea56504a3.tar.gz rails-e9f9ce971e17bcdc0cf74af926fdeacea56504a3.tar.bz2 rails-e9f9ce971e17bcdc0cf74af926fdeacea56504a3.zip | |
Merge pull request #1296 from c42engineering/issue636
Resubmitting issue #636 as a pull request
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash/conversions.rb | 2 |
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 102378a029..5f07bb4f5a 100644 --- a/activesupport/lib/active_support/core_ext/hash/conversions.rb +++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb @@ -95,7 +95,7 @@ class Hash case value.class.to_s when 'Hash' if value['type'] == 'array' - _, entries = Array.wrap(value.detect { |k,v| k != 'type' }) + _, entries = Array.wrap(value.detect { |k,v| not v.is_a?(String) }) if entries.nil? || (c = value['__content__'] && c.blank?) [] else |