Added better landing page handling

diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl
index 91ac29fc897fb780197840be21006e0d2714cc58..07a9ad49ee90cde2068678cb40ff40147908bb95 100644 (file)
--- a/com.woltlab.wcf/template/header.tpl
+++ b/com.woltlab.wcf/template/header.tpl
@@ -15,7 +15,7 @@
                </nav>
                
                <div id="logo" class="logo">
-                       <a href="{link controller='Index'}{/link}">
+                       <a href="{link}{/link}">
                                <img src="{@$__wcf->getPath('wbb')}images/wbbLogo2.svg" alt="" style="height: 90px; width: 246px;" />
                                {*event name='headerLogo'*}
                        </a>

diff --git a/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php b/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php
index 50c32e229927dd1015dadfe0276a53846ad46f97..604a34fb10071dd578dd0e464bd537a0b2559c64 100644 (file)
--- a/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php
+++ b/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php
@@ -1,9 +1,12 @@
 <?php
 namespace wcf\system\menu\page;
+use wcf\system\breadcrumb\Breadcrumb;
 use wcf\system\cache\CacheHandler;
 use wcf\system\event\EventHandler;
 use wcf\system\menu\ITreeMenuItem;
 use wcf\system\menu\TreeMenu;
+use wcf\system\request\LinkHandler;
+use wcf\system\WCF;
 
 /**
  * Builds the page menu.
@@ -48,6 +51,14 @@ class PageMenu extends TreeMenu {
                                }
                        }
                }
+               
+               // set default menu item
+               if ($this->landingPage !== null) {
+                       $this->setActiveMenuItem($this->landingPage->menuItem);
+                       
+                       // add main breadcrumbs entry
+                       WCF::getBreadcrumbs()->add(new Breadcrumb(WCF::getLanguage()->get(PAGE_TITLE), LinkHandler::getInstance()->getLink()));
+               }
        }
        
        /**