fixed exception when usung non root pages

heimrichhannot · Jul 22, 2020 · 168fb06 · 168fb06
1 parent 22c4fb3
commit 168fb06
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [1.3.2] - 2020-07-22
+- fixed non-root pages leading to exception
+
 ## [1.3.1] - 2020-04-17
 - fixed root page url was used instead of index page url
 

diff --git a/src/Module/ModuleRootnav.php b/src/Module/ModuleRootnav.php
@@ -119,7 +119,11 @@ protected function generateNavigationItems(array $pages, $groups, $targetPages)
 
             // Do not show protected pages unless a back end or front end user is logged in
             if (!$page['protected'] || BE_USER_LOGGED_IN || (\is_array($pageGroups) && \count(array_intersect($pageGroups, $groups))) || $this->showProtected) {
-                $model = PageModel::findFirstPublishedByPid($page['id']);
+                if ('root' === $page['type']) {
+                    $model = PageModel::findFirstPublishedByPid($page['id']);
+                } else {
+                    $model = PageModel::findByPk($page['id']);
+                }
                 $href = $model->getAbsoluteUrl();
 
                 $trail = \in_array($page['id'], $objPage->trail, true);