From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 31 Dec 2012 02:19:39 +0000 (+0100)
Subject: Added better landing page handling
X-Git-Tag: 2.0.0_Beta_1~633^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d208476540a1d6a3164f1e2f6b2e2400132ad7a0;p=GitHub%2FWoltLab%2FWCF.git

Added better landing page handling
---

diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl
index 91ac29fc89..07a9ad49ee 100644
--- 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 50c32e2299..604a34fb10 100644
--- 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()));
+		}
 	}
 	
 	/**