Merge branch '4' into 5.0

silverstripe · Apr 27, 2023 · ca837d6 · ca837d6
2 parents 6675f50 + 8317309
commit ca837d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php
@@ -735,13 +735,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] ?? '';
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -55,4 +55,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,4 +55,4 @@ @@
         },
         "prefer-stable": true,
         "minimum-stability": "dev"
-    }
+    }