[Elements] getChildren & getSiblings shouldn't load the listing - fol…

…low up to #13899
pimcore · Jan 9, 2023 · 566d7d6 · 566d7d6
1 parent 3608386
commit 566d7d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/models/Asset.php b/models/Asset.php
@@ -904,17 +904,13 @@ public function getSiblings(): Listing
         return $this->siblings;
     }
 
-    public function hasSiblings(): ?bool
+    public function hasSiblings(): bool
     {
         if (is_bool($this->hasSiblings)) {
-            if (($this->hasSiblings && empty($this->siblings->getAssets())) || (!$this->hasSiblings && !empty($this->siblings->getAssets()))) {
-                return $this->getDao()->hasSiblings();
-            } else {
-                return $this->hasSiblings;
-            }
+            return $this->hasSiblings;
         }
 
-        return $this->getDao()->hasSiblings();
+        return $this->hasSiblings = $this->getDao()->hasSiblings();
     }
 
     public function hasChildren(): bool

diff --git a/models/Asset/Folder.php b/models/Asset/Folder.php
@@ -85,14 +85,10 @@ public function getChildren(): Listing
     public function hasChildren(): bool
     {
         if (is_bool($this->hasChildren)) {
-            if (($this->hasChildren && empty($this->children->getAssets())) || (!$this->hasChildren && !empty($this->children->getAssets()))) {
-                return $this->getDao()->hasChildren();
-            }
-
             return $this->hasChildren;
         }
 
-        return $this->getDao()->hasChildren();
+        return $this->hasChildren = $this->getDao()->hasChildren();
     }
 
     /**