tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 06:05:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4' into 5.0

Browse Source
This commit is contained in:
Guy Sartorelli 2023-04-27 14:44:59 +12:00
commit ca837d6ccd
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/Model/SiteTree.php
View File

@ -735,13 +735,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] ?? '';
}
/**

2
composer.json
View File

@ -55,4 +55,4 @@
},
"prefer-stable": true,
"minimum-stability": "dev"
}
}