fix: use root as an ultimate fallback (#313)

pimcore · Mar 15, 2023 · be7c72a · be7c72a
1 parent 423094e
commit be7c72a
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/Resolver/Location/FindOrCreateFolderStrategy.php b/src/Resolver/Location/FindOrCreateFolderStrategy.php
@@ -74,24 +74,25 @@ public function setSettings(array $settings): void
     public function updateParent(ElementInterface $element, array $inputData): ElementInterface
     {
         $newParent = null;
-
         $identifier = $inputData[$this->dataSourceIndex] ?? null;
 
-        $newParent = $this->dataObjectLoader->loadByPath($identifier);
+        if ($identifier) {
+            $newParent = $this->dataObjectLoader->loadByPath($identifier);
 
-        if (!($newParent instanceof DataObject) && $identifier) {
-            $newParent = Service::createFolderByPath($identifier);
+            if (!($newParent instanceof DataObject)) {
+                $newParent = Service::createFolderByPath($identifier);
+            }
         }
 
         if (!($newParent instanceof DataObject) && $this->fallbackPath) {
             $newParent = DataObject::getByPath($this->fallbackPath);
         }
 
-        if ($newParent) {
-            return $element->setParent($newParent);
+        if (!($newParent)) {
+            $newParent = DataObject::getById(1);
         }
 
-        return $element;
+        return $element->setParent($newParent);
     }
 
     protected function loadById()