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 '3.6' into 3

Browse Source
This commit is contained in:
Daniel Hensby 2017-05-26 14:56:15 +01:00
commit c3a6595bb8
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -12,7 +12,7 @@ addons:
env: env:
global: global:
- CORE_RELEASE=3 - CORE_RELEASE=3.5
matrix: matrix:
include: include:

20
code/model/SiteTree.php
View File

@ -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 * @return bool Success
*/ */
public function doArchive() { public function doArchive() {
$this->invokeWithExtensions('onBeforeArchive', $this); $this->invokeWithExtensions('onBeforeArchive', $this);
$doDelete = false;
if($this->doUnpublish()) { if($this->ExistsOnLive) {
$this->delete(); $doDelete = $this->doUnpublish();
$this->invokeWithExtensions('onAfterArchive', $this); } else {
$doDelete = true;
return true;
} }
return false; if ($doDelete) {
$this->delete();
$this->invokeWithExtensions('onAfterArchive', $this);
}
return $doDelete;
} }
/** /**