Merge branch '4.6' into 4

This commit is contained in:
Steve Boyd 2020-09-08 14:28:09 +12:00
commit 72e406aa63

View File

@ -2403,7 +2403,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
}
// "unpublish"
if ($isPublished && $canPublish && $isOnDraft && $canUnpublish) {
if ($isPublished && $isOnDraft && $canUnpublish) {
$moreOptions->push(
FormAction::create('unpublish', _t(__CLASS__.'.BUTTONUNPUBLISH', 'Unpublish'), 'delete')
->setDescription(_t(__CLASS__.'.BUTTONUNPUBLISHDESC', 'Remove this page from the published site'))