Merge branch '4.12' into 4.13

This commit is contained in:
Guy Sartorelli 2023-04-24 11:49:18 +12:00
commit cd7fe60a33
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A

View File

@ -741,13 +741,15 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
/**
* 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] ?? '';
}
/**