aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/named_scope.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb
index dd2a90b8e5..bbe2d1f205 100644
--- a/activerecord/lib/active_record/named_scope.rb
+++ b/activerecord/lib/active_record/named_scope.rb
@@ -92,12 +92,7 @@ module ActiveRecord
when Hash
options
when Proc
- case parent_scope
- when Scope
- with_scope(:find => parent_scope.proxy_options) { options.call(*args) }
- else
- options.call(*args)
- end
+ options.call(*args)
end, &block)
end
metaclass.instance_eval do