Merge branch '4.13' into 4

silverstripe · Apr 26, 2023 · 8317309 · 8317309
2 parents 2b185d7 + cd7fe60
commit 8317309
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 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] ?? '';
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -45,11 +45,14 @@
     },
     "autoload": {
         "psr-4": {
-            "SilverStripe\\CMS\\": ["code/", "_legacy/"],
+            "SilverStripe\\CMS\\": [
+                "code/",
+                "_legacy/"
+            ],
             "SilverStripe\\CMS\\Tests\\": "code/php/",
             "SilverStripe\\CMS\\Tests\\Behaviour\\": "tests/behat/src/"
         }
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}