aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/query_methods.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2012-04-13 13:12:28 +0100
committerJon Leighton <j@jonathanleighton.com>2012-04-13 13:17:43 +0100
commitbe89e9a35162b3015e2aee53300fdf04752652ce (patch)
tree35aad2aa257da5a1f416da2be1a98e03c4ba4337 /activerecord/lib/active_record/relation/query_methods.rb
parent8d5be98ad72939037f1be52aa4bb4672fff02abb (diff)
downloadrails-be89e9a35162b3015e2aee53300fdf04752652ce.tar.gz
rails-be89e9a35162b3015e2aee53300fdf04752652ce.tar.bz2
rails-be89e9a35162b3015e2aee53300fdf04752652ce.zip
remove apply_finder_options call from AssociationScope
Diffstat (limited to 'activerecord/lib/active_record/relation/query_methods.rb')
-rw-r--r--activerecord/lib/active_record/relation/query_methods.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index eaa3ddaec8..ffca88f69f 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -356,7 +356,7 @@ module ActiveRecord
modules << Module.new(&block) if block_given?
self.extending_values = modules.flatten
- extend(*extending_values)
+ extend(*extending_values) if extending_values.any?
self
end