Merge branch '4.12' into 4.13

silverstripe · Apr 23, 2023 · cd7fe60 · cd7fe60
2 parents 873c697 + 241fa3e
commit cd7fe60
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php
@@ -741,13 +741,15 @@ public function getAbsoluteLiveLink($includeStageEqualsLive = true)
     /**
      * Generates a link to edit this page in the CMS.
      *
+     * Implemented here to satisfy the CMSPreviewable interface, but data is intended to be loaded via Extension
+     *
+     * @see SilverStripe\Admin\CMSEditLinkExtension
+     *
      * @return string
      */
     public function CMSEditLink()
     {
-        // This method has to be implemented here to satisfy the CMSPreviewable interface.
-        // See the actual implementation in CMSEditLinkExtension.
-        return $this->extend('CMSEditLink')[0];
+        return $this->extend('CMSEditLink')[0] ?? '';
     }
 
     /**