mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 06:05:56 +00:00
Keep a more shared understanding of Archived (#2476)
Keep a more shared understanding of Archived
This commit is contained in:
commit
bdf2cccb80
@ -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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user