Simplify Model.scoped definition

b8b6621a · Pratik Naik · 603d4fba · b8b6621a
隐藏空白更改
内联并排

Showing with 1 addition and 7 deletion

activerecord/lib/active_record/named_scope.rb activerecord/lib/active_record/named_scope.rb +1 -7

未找到文件。
--- a/activerecord/lib/active_record/named_scope.rb
+++ b/activerecord/lib/active_record/named_scope.rb
@@ -26,13 +26,7 @@ def scoped(options = {}, &block)
        if options.present?
          Scope.new(self, options, &block)
        else
-          current_scope = current_scoped_methods
-
-          unless current_scope
-            unscoped.spawn
-          else
-            construct_finder_arel({}, current_scoped_methods)
-          end
+          current_scoped_methods ? unscoped.merge(current_scoped_methods) : unscoped.spawn
        end
      end