diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-08-25 11:11:08 +0200 |
|---|---|---|
| committer | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-08-25 11:11:08 +0200 |
| commit | e464f9b6b93daa847a7d6fa1c3af63c8cef3f3e2 (patch) | |
| tree | 6fcd3b1a2c30a2c25b85915af5a4277765f26858 /activerecord/lib/active_record/associations/association_proxy.rb | |
| parent | 90a9637d41016c0d230ba36657e83a4f8d54cc46 (diff) | |
| parent | fb20d6f09d5e91280bf2b5888a7299b50dba7a7b (diff) | |
| download | rails-e464f9b6b93daa847a7d6fa1c3af63c8cef3f3e2.tar.gz rails-e464f9b6b93daa847a7d6fa1c3af63c8cef3f3e2.tar.bz2 rails-e464f9b6b93daa847a7d6fa1c3af63c8cef3f3e2.zip | |
Merge commit 'rails/master' into i18n
Diffstat (limited to 'activerecord/lib/active_record/associations/association_proxy.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_proxy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb index 981be3b1a9..99b8748a48 100644 --- a/activerecord/lib/active_record/associations/association_proxy.rb +++ b/activerecord/lib/active_record/associations/association_proxy.rb @@ -213,7 +213,7 @@ module ActiveRecord # Array#flatten has problems with recursive arrays. Going one level deeper solves the majority of the problems. def flatten_deeper(array) - array.collect { |element| element.respond_to?(:flatten) ? element.flatten : element }.flatten + array.collect { |element| (element.respond_to?(:flatten) && !element.is_a?(Hash)) ? element.flatten : element }.flatten end def owner_quoted_id |