diff --git a/src/services/BlockUsageService.php b/src/services/BlockUsageService.php index e9d2315..5c01363 100755 --- a/src/services/BlockUsageService.php +++ b/src/services/BlockUsageService.php @@ -109,7 +109,11 @@ public function getCounts(int $fieldId) $topLevelEntries = $entries->map(function($entry){ try { + // Trashed entries don't have an owner $owner = $entry->getOwner(); + if ($owner === null) { + return $entry; + } while($owner->getOwner()) { $owner = $owner->getOwner(); } diff --git a/src/templates/entries.twig b/src/templates/entries.twig index 07ac983..f6756f9 100644 --- a/src/templates/entries.twig +++ b/src/templates/entries.twig @@ -77,20 +77,20 @@ {% for entry in blockEntries.entries %} - - - {{ entry.id }} - - {{ entry.title }} - - - {{ entry.section.name }} - - - {{ entry.type.name }} - - - + {% if entry.section and entry.type %} + + {{ entry.id }} + + {{ entry.title }} + + + {{ entry.section.name }} + + + {{ entry.type.name }} + + + {% endif %} {% endfor %}