Adding upstream version 1.11.1.upstream/1.11.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/library/Director/DirectorObject/Automation/CompareBasketObject.php b/library/Director/DirectorObject/Automation/CompareBasketObject.php
index ef2e9e2..f1ab6a9 100644
--- a/library/Director/DirectorObject/Automation/CompareBasketObject.php
+++ b/library/Director/DirectorObject/Automation/CompareBasketObject.php
@@ -31,7 +31,7 @@ class CompareBasketObject
                 static::normalize($v);
             }
             unset($v);
-            $value = $sorted;
+            $value = (object) $sorted;
 
             // foreign baskets might not sort those lists correctly:
             if (isset($value->list_name) && isset($value->entries)) {
@@ -46,7 +46,11 @@ class CompareBasketObject
     protected static function sortListBy($key, &$list)
     {
         usort($list, function ($a, $b) use ($key) {
-            return $a->$key > $b->$key ? -1 : 1;
+            if (is_array($a)) {
+                return $a[$key] > $b[$key] ? -1 : 1;
+            } else {
+                return $a->$key > $b->$key ? -1 : 1;
+            }
         });
     }