diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php index 734ad8b81..373021f2d 100755 --- a/core/model/SiteTree.php +++ b/core/model/SiteTree.php @@ -1435,11 +1435,20 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid } else { $virtualPages = DataObject::get('VirtualPage', "SiteTree$suffix.ID = SiteTree$suffix.ID AND CopyContentFromID = {$this->ID}"); } + if(class_exists('Subsite')) { + $redirectorPages = Subsite::get_from_all_subsites('RedirectorPage', "SiteTree$suffix.ID = SiteTree$suffix.ID AND LinkToID = {$this->ID}"); + } else { + $redirectorPages = DataObject::get('RedirectorPage', "SiteTree$suffix.ID = SiteTree$suffix.ID AND LinkToID = {$this->ID}"); + } if($virtualPages) foreach($virtualPages as $page) { // $page->write() calls syncLinkTracking, which does all the hard work for us. $page->write(); } + if($redirectorPages) foreach($redirectorPages as $page) { + // $page->write() calls syncLinkTracking, which does all the hard work for us. + $page->write(); + } parent::onAfterDelete(); } @@ -2022,6 +2031,18 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid } if ($virtualPages) foreach($virtualPages as $vp) $vp->doUnpublish(); + $suffix = Versioned::current_stage() == 'Live' ? '_Live' : ''; + if(class_exists('Subsite')) { + $redirectorPages = Subsite::get_from_all_subsites('RedirectorPage', "SiteTree$suffix.ID = SiteTree$suffix.ID AND LinkToID = {$this->ID}"); + } else { + $redirectorPages = DataObject::get('RedirectorPage', "SiteTree$suffix.ID = SiteTree$suffix.ID AND LinkToID = {$this->ID}"); + } + + if($redirectorPages) foreach($redirectorPages as $page) { + // $page->write() calls syncLinkTracking, which does all the hard work for us. + $page->write(); + } + $this->extend('onAfterUnpublish'); }