tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4.13' into 4

This commit is contained in:
Guy Sartorelli 2023-04-26 12:44:39 +12:00
parent 2b185d7ef7 cd7fe60a33
commit 8317309864
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/Model/SiteTree.php
View File

@ -741,13 +741,15 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
/** /**
* Generates a link to edit this page in the CMS. * 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 * @return string
*/ */
public function CMSEditLink() public function CMSEditLink()
{ {
// This method has to be implemented here to satisfy the CMSPreviewable interface. return $this->extend('CMSEditLink')[0] ?? '';
// See the actual implementation in CMSEditLinkExtension.
return $this->extend('CMSEditLink')[0];
} }
/** /**

7
composer.json
View File

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