lib/closure_tree/support.rb in closure_tree-4.2.7 vs lib/closure_tree/support.rb in closure_tree-4.2.8

@@ -66,10 +66,14 @@
       end
       opts
     end
 
     def scope_with_order(scope, additional_order_by = nil)
-      order_option? ? scope.order(*([additional_order_by, order_by].compact)) : scope
+      if order_option?
+        scope.order(*([additional_order_by, order_by].compact))
+      else
+        additional_order_by ? scope.order(additional_order_by) : scope
+      end
     end
 
     # lambda-ize the order, but don't apply the default order_option
     def has_many_without_order_option(opts)
       if ActiveRecord::VERSION::MAJOR > 3