From 0872a23aa8345c7baf66791ca2f32db2a8343336 Mon Sep 17 00:00:00 2001
From: Adrian Humphreys <adrian.humphreys@silverstripe.com>
Date: Mon, 9 Sep 2019 07:50:10 +1200
Subject: [PATCH] Keep a more shared understanding of Archived

---
 code/Controllers/SilverStripeNavigatorItem.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/code/Controllers/SilverStripeNavigatorItem.php b/code/Controllers/SilverStripeNavigatorItem.php
index 04e619be..4c5644a4 100644
--- a/code/Controllers/SilverStripeNavigatorItem.php
+++ b/code/Controllers/SilverStripeNavigatorItem.php
@@ -128,14 +128,7 @@ abstract class SilverStripeNavigatorItem extends ViewableData
         }
 
         if (!isset($record->_cached_isArchived)) {
-            $baseClass = $record->baseClass();
-            $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))
-            );
+            $record->_cached_isArchived = $record->isArchived();
         }
 
         return $record->_cached_isArchived;