aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-14 01:12:49 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-14 01:12:49 -0800
commit92253829dee9a1fb545f71f71894dee1df604f74 (patch)
treee5a305fc6ddcdc87a082dc4c8ed7114f2dce1ffa /activerecord/lib/active_record/associations
parent58c0d31487d158286576b0745a55a0941ed076ad (diff)
downloadrails-92253829dee9a1fb545f71f71894dee1df604f74.tar.gz
rails-92253829dee9a1fb545f71f71894dee1df604f74.tar.bz2
rails-92253829dee9a1fb545f71f71894dee1df604f74.zip
Ruby 1.9.2: fix flatten_deeper to preserve nils
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r--activerecord/lib/active_record/associations/association_proxy.rb2
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 9b96ec0cf4..3cd1a1d922 100644
--- a/activerecord/lib/active_record/associations/association_proxy.rb
+++ b/activerecord/lib/active_record/associations/association_proxy.rb
@@ -268,7 +268,7 @@ module ActiveRecord
if elem.respond_to?(:each)
flatten_deeper(elem)
else
- Array.wrap(elem)
+ [elem]
end
end
end