FIX Restore write to getOwnerPage and prevent write recursion

silverstripe · Jul 11, 2019 · 66f0942 · 66f0942
1 parent 8637239
commit 66f0942
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/src/Models/ElementalArea.php b/src/Models/ElementalArea.php
@@ -137,12 +137,6 @@ public function ElementControllers()
         return $controllers;
     }
 
-    public function onBeforeWrite()
-    {
-        $this->getOwnerPage();
-        parent::onBeforeWrite();
-    }
-
     /**
      * @return null|DataObject
      * @throws \Psr\Container\NotFoundExceptionInterface
@@ -197,14 +191,17 @@ public function getOwnerPage()
                     throw $ex;
                 }
 
-                if ($page) {
+                if ($page && $page->exists()) {
                     if ($this->OwnerClassName !== $class) {
                         $this->OwnerClassName = $class;
-                        $this->write();
+
+                        // Avoid recursion: only write if it's already in the database
+                        if ($this->isInDB()) {
+                            $this->write();
+                        }
                     }
 
-                    $this->cacheData['area_relation_name'] = $page;
-                    return $page;
+                    return $this->cacheData['area_relation_name'] = $page->first();
                 }
             }
         }