arrange no longer clears order in default scope

issue introduced by 75cf67e
stefankroes · Nov 2, 2018 · ac994f5 · ac994f5
1 parent cbaa20a
commit ac994f5
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/ancestry/class_methods.rb b/lib/ancestry/class_methods.rb
@@ -27,10 +27,13 @@ def orphan_strategy= orphan_strategy
       end
     end
 
-    # Arrangement
+    # Get all nodes and sorting them into an empty hash
     def arrange options = {}
-      # Get all nodes ordered by ancestry and start sorting them into an empty hash
-      arrange_nodes self.ancestry_base_class.reorder(options.delete(:order)).where(options)
+      if (order = options.delete(:order))
+        arrange_nodes self.ancestry_base_class.order(order).where(options)
+      else
+        arrange_nodes self.ancestry_base_class.where(options)
+      end
     end
 
     # Arrange array of nodes into a nested hash of the form