diff --git a/src/Models/BaseElement.php b/src/Models/BaseElement.php index a3f89c22..81eaf858 100644 --- a/src/Models/BaseElement.php +++ b/src/Models/BaseElement.php @@ -627,21 +627,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 index 872bce3e..06ca9612 100644 --- a/tests/BaseElementTest.php +++ b/tests/BaseElementTest.php @@ -503,4 +503,16 @@ public function testPreviewLink(string $class, string $elementIdentifier, ?strin $this->assertEmpty(rtrim($previewLink ?? '', '/')); } } + + 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'); + } }