Merge pull request silverstripe#1103 from rasstislav/4.11

FIX Element::getPage returning the wrong page
creative-commoners · Sep 25, 2023 · c3132ff · c3132ff
2 parents d8a76f3 + 0af0645
commit c3132ff
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git 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
@@ -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');
+    }
 }