mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
Merge branch '3.6.0' into 3.6
This commit is contained in:
commit
779a20de02
@ -2541,21 +2541,27 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes the page from both live and stage
|
||||
* Removes the page from both live and stage, if it exists on both
|
||||
* otherwise just removes from stage
|
||||
*
|
||||
* @return bool Success
|
||||
*/
|
||||
public function doArchive() {
|
||||
$this->invokeWithExtensions('onBeforeArchive', $this);
|
||||
$doDelete = false;
|
||||
|
||||
if($this->doUnpublish()) {
|
||||
$this->delete();
|
||||
$this->invokeWithExtensions('onAfterArchive', $this);
|
||||
|
||||
return true;
|
||||
if($this->ExistsOnLive) {
|
||||
$doDelete = $this->doUnpublish();
|
||||
} else {
|
||||
$doDelete = true;
|
||||
}
|
||||
|
||||
return false;
|
||||
if ($doDelete) {
|
||||
$this->delete();
|
||||
$this->invokeWithExtensions('onAfterArchive', $this);
|
||||
}
|
||||
|
||||
return $doDelete;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user