tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Keep a more shared understanding of Archived

Browse Source
This commit is contained in:
Adrian Humphreys 2019-09-09 07:50:10 +12:00
parent d7e64199a7
commit 0872a23aa8
No known key found for this signature in database
GPG Key ID: 4DBA3DAC36221FFA
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/Controllers/SilverStripeNavigatorItem.php
View File

@ -128,14 +128,7 @@ abstract class SilverStripeNavigatorItem extends ViewableData
} }
if (!isset($record->_cached_isArchived)) { if (!isset($record->_cached_isArchived)) {
$baseClass = $record->baseClass(); $record->_cached_isArchived = $record->isArchived();
$currentDraft = Versioned::get_by_stage($baseClass, Versioned::DRAFT)->byID($record->ID);
$currentLive = Versioned::get_by_stage($baseClass, Versioned::LIVE)->byID($record->ID);
$record->_cached_isArchived = (
(!$currentDraft || ($currentDraft && $record->Version != $currentDraft->Version))
&& (!$currentLive || ($currentLive && $record->Version != $currentLive->Version))
);
} }
return $record->_cached_isArchived; return $record->_cached_isArchived;