From 969ad8911cf5aa7b0d06a07fd2f4a0c32a50a2bc Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 14 Jan 2017 15:34:52 +0000 Subject: [PATCH] Updated page nav to hide when empty --- app/Repos/EntityRepo.php | 8 ++++---- resources/views/pages/sidebar-tree-list.blade.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Repos/EntityRepo.php b/app/Repos/EntityRepo.php index 0515a4cd4..83e79ac9b 100644 --- a/app/Repos/EntityRepo.php +++ b/app/Repos/EntityRepo.php @@ -836,18 +836,18 @@ class EntityRepo /** * Parse the headers on the page to get a navigation menu * @param Page $page - * @return Collection + * @return array */ public function getPageNav(Page $page) { - if ($page->html == '') return null; + if ($page->html == '') return []; libxml_use_internal_errors(true); $doc = new DOMDocument(); $doc->loadHTML(mb_convert_encoding($page->html, 'HTML-ENTITIES', 'UTF-8')); $xPath = new DOMXPath($doc); $headers = $xPath->query("//h1|//h2|//h3|//h4|//h5|//h6"); - if (is_null($headers)) return null; + if (is_null($headers)) return []; $tree = collect([]); foreach ($headers as $header) { @@ -868,7 +868,7 @@ class EntityRepo return $header; }); } - return $tree; + return $tree->toArray(); } /** diff --git a/resources/views/pages/sidebar-tree-list.blade.php b/resources/views/pages/sidebar-tree-list.blade.php index 0fb97369e..f366e9e9b 100644 --- a/resources/views/pages/sidebar-tree-list.blade.php +++ b/resources/views/pages/sidebar-tree-list.blade.php @@ -26,7 +26,7 @@ @endforeach @endif - @if (isset($pageNav) && $pageNav) + @if (isset($pageNav) && count($pageNav))
{{ trans('entities.pages_navigation') }}