Merge branch '5.0' into 5.1

silverstripe · Oct 1, 2023 · 893684f · 893684f
2 parents 9553867 + c868a30
commit 893684f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/Models/BaseElement.php b/src/Models/BaseElement.php
@@ -692,21 +692,28 @@ public function getSimpleClassName()
 
     /**
      * Despite the name of the method, getPage can return any type of DataObject
+     *
      * @return null|DataObject
      * @throws \Psr\Container\NotFoundExceptionInterface
      * @throws \SilverStripe\ORM\ValidationException
      */
     public function getPage()
     {
-        // Allow for repeated calls to be cached
         if (isset($this->cacheData['page'])) {
-            return $this->cacheData['page'];
+            if (isset($this->cacheData['parent_id']) && $this->cacheData['parent_id'] === $this->ParentID) {
+                return $this->cacheData['page'];
+            }
         }
 
         $class = DataObject::getSchema()->hasOneComponent($this, 'Parent');
         $area = ($this->ParentID) ? DataObject::get_by_id($class, $this->ParentID) : null;
+
         if ($area instanceof ElementalArea && $area->exists()) {
-            $this->cacheData['page'] = $area->getOwnerPage();
+            $page = $area->getOwnerPage();
+
+            $this->cacheData['page'] = $page;
+            $this->cacheData['parent_id'] = $this->ParentID;
+
             return $this->cacheData['page'];
         }
 

diff --git a/tests/BaseElementTest.php b/tests/BaseElementTest.php
@@ -511,4 +511,17 @@ public function testGetContentForCmsSearch()
         $element = $this->objFromFixture(TestElement::class, 'elementDataObject3');
         $this->assertSame('Hello Test|#|Element 3', $element->getContentForCmsSearch());
     }
+
+
+    public function testGetPage()
+    {
+        $element = $this->objFromFixture(ElementContent::class, 'content1');
+
+        $this->assertStringContainsString($element->getPage()->Title, 'Test Elemental');
+
+        $newArea = $this->objFromFixture(ElementalArea::class, 'area52');
+        $element->ParentID = $newArea->ID;
+
+        $this->assertStringContainsString($element->getPage()->Title, 'Page with one elements');
+    }
 }