aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-11-25 20:00:40 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2010-11-25 20:00:40 -0200
commit438c0188f8aa07d0e9895a2c13886901ca40ed5e (patch)
treea4b70e67497cd51d8e14ff902f686bb3cf2ef07a
parenta3bd62e1bae64569d0c2d45f8068f291e3e0e776 (diff)
downloadrails-438c0188f8aa07d0e9895a2c13886901ca40ed5e.tar.gz
rails-438c0188f8aa07d0e9895a2c13886901ca40ed5e.tar.bz2
rails-438c0188f8aa07d0e9895a2c13886901ca40ed5e.zip
nil check unneeded ht. exviva
-rw-r--r--activerecord/lib/active_record/associations/association_collection.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
index e4e5ffd2b3..ba9373ba6a 100644
--- a/activerecord/lib/active_record/associations/association_collection.rb
+++ b/activerecord/lib/active_record/associations/association_collection.rb
@@ -236,7 +236,7 @@ module ActiveRecord
# Removes all records from this association. Returns +self+ so method calls may be chained.
def clear
unless length.zero? # forces load_target if it hasn't happened already
- if @reflection.options[:dependent] && @reflection.options[:dependent] == :destroy
+ if @reflection.options[:dependent] == :destroy
destroy_all
else
delete_all