Fix breadcrumb support of multiple folders with the same name. Fixes #54

dauxio · Jun 5, 2018 · 0570fb7 · 0570fb7
1 parent 049e5cd
commit 0570fb7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libs/Format/HTML/ContentPage.php b/libs/Format/HTML/ContentPage.php
@@ -52,7 +52,7 @@ private function getBreadcrumbTrail($parents, $multilanguage)
         if (!empty($parents)) {
             foreach ($parents as $node) {
                 $page = $node->getIndexPage() ?: $node->getFirstPage();
-                $breadcrumb_trail[$node->getTitle()] = $page ? $page->getUrl() : '';
+                $breadcrumb_trail[] = ['title' => $node->getTitle(), 'url' => $page ? $page->getUrl() : ''];
             }
         }
 
@@ -98,7 +98,7 @@ protected function generatePage()
             $page['breadcrumb_separator'] = $params['html']['breadcrumb_separator'];
 
             if ($this->homepage) {
-                $page['breadcrumb_trail'] = [$this->file->getTitle() => ''];
+                $page['breadcrumb_trail'] = [['title' => $this->file->getTitle(), 'url' => '']];
             }
         }
 

diff --git a/libs/Format/HTML/Template.php b/libs/Format/HTML/Template.php
@@ -99,8 +99,8 @@ protected function registerFunctions($engine)
             $title = '';
             $breadcrumb_trail = $page['breadcrumb_trail'];
             $separator = $this->getSeparator($page['breadcrumb_separator']);
-            foreach ($breadcrumb_trail as $key => $value) {
-                $title .= '<a href="' . $base_page . $value . '">' . $key . '</a>' . $separator;
+            foreach ($breadcrumb_trail as $value) {
+                $title .= '<a href="' . $base_page . $value['url'] . '">' . $value['title'] . '</a>' . $separator;
             }
             if ($page['filename'] === 'index' || $page['filename'] === '_index') {
                 if ($page['title'] != '') {