From: Tim Düsterhus <timwolla@arcor.de>
Date: Mon, 12 Dec 2011 16:45:12 +0000 (+0100)
Subject: Adding getLink()-method for page-menu
X-Git-Tag: 2.0.0_Beta_1~1520^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1397d3ef64567662c51a1cc3545fba602c5a3e85;p=GitHub%2FWoltLab%2FWCF.git

Adding getLink()-method for page-menu
---

diff --git a/com.woltlab.wcf/template/footerMenu.tpl b/com.woltlab.wcf/template/footerMenu.tpl
index ec789da5e2..4f3561ddc4 100644
--- a/com.woltlab.wcf/template/footerMenu.tpl
+++ b/com.woltlab.wcf/template/footerMenu.tpl
@@ -3,7 +3,7 @@
 		<li id="toTopLink" class="toTopLink"><a href="#top" title="{lang}wcf.global.scrollUp{/lang}" class="balloonTooltip"><img src="{icon size='S'}toTop{/icon}" alt="" /> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
 		{if $__wcf->getPageMenu()->getMenuItems('footer')|count > 0}
 			{foreach from=$__wcf->getPageMenu()->getMenuItems('footer') item=menuItem}
-				<li><a href="{$menuItem->menuItemLink}">{$menuItem->menuItem} ({#$menuItem->getProcessor()->getNotifications()})</a></li>
+				<li><a href="{$menuItem->getProcessor()->getLink()}">{$menuItem->menuItem} ({#$menuItem->getProcessor()->getNotifications()})</a></li>
 			{/foreach}
 		{/if}
 	</ul>
diff --git a/com.woltlab.wcf/template/mainMenu.tpl b/com.woltlab.wcf/template/mainMenu.tpl
index 34a1695578..ed9b084a87 100644
--- a/com.woltlab.wcf/template/mainMenu.tpl
+++ b/com.woltlab.wcf/template/mainMenu.tpl
@@ -2,12 +2,12 @@
 	<nav id="mainMenu" class="mainMenu">
 		<ul>
 			{foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=menuItem}
-				<li{if $__wcf->getPageMenu()->getActiveMenuItem() == $menuItem->menuItem} class="activeMenuItem"{/if}><a href="{$menuItem->menuItemLink}">{lang}{$menuItem->menuItem}{/lang}{if $menuItem->getProcessor()->getNotifications()} <span class="badge">{#$menuItem->getProcessor()->getNotifications()}</span>{/if}</a> 
+				<li{if $__wcf->getPageMenu()->getActiveMenuItem() == $menuItem->menuItem} class="activeMenuItem"{/if}><a href="{$menuItem->getProcessor()->getLink()}">{lang}{$menuItem->menuItem}{/lang}{if $menuItem->getProcessor()->getNotifications()} <span class="badge">{#$menuItem->getProcessor()->getNotifications()}</span>{/if}</a> 
 				
 				{if $__wcf->getPageMenu()->getMenuItems($menuItem->menuItem)|count > 0}
 					<ul>
 						{foreach from=$__wcf->getPageMenu()->getMenuItems($menuItem->menuItem) item=subMenuItem}
-							<li><a href="{$subMenuItem->menuItemLink}">{lang}{$subMenuItem->menuItem}{/lang}</a>{if $subMenuItem->getProcessor()->getNotifications()} <span class="badge">{#$subMenuItem->getProcessor()->getNotifications()}</span>{/if}</li>
+							<li><a href="{$subMenuItem->getProcessor()->getLink()}">{lang}{$subMenuItem->menuItem}{/lang}</a>{if $subMenuItem->getProcessor()->getNotifications()} <span class="badge">{#$subMenuItem->getProcessor()->getNotifications()}</span>{/if}</li>
 						{/foreach}
 					</ul>
 				{/if}
diff --git a/wcfsetup/install/files/lib/system/menu/page/DefaultPageMenuItemProvider.class.php b/wcfsetup/install/files/lib/system/menu/page/DefaultPageMenuItemProvider.class.php
index 5036676f9f..8f3d54b1a6 100644
--- a/wcfsetup/install/files/lib/system/menu/page/DefaultPageMenuItemProvider.class.php
+++ b/wcfsetup/install/files/lib/system/menu/page/DefaultPageMenuItemProvider.class.php
@@ -31,4 +31,12 @@ class DefaultPageMenuItemProvider extends DatabaseObjectDecorator implements IPa
 	public function getNotifications() {
 		return 0;
 	}
+	
+	/**
+	 * @see	wcf\system\menu\page\IPageMenuItemProvider::getLink()
+	 */
+	public function getLink() {
+		// explicit call to satisfy our interface
+		return $this->getDecoratedObject()->getLink();
+	}
 }
diff --git a/wcfsetup/install/files/lib/system/menu/page/IPageMenuItemProvider.class.php b/wcfsetup/install/files/lib/system/menu/page/IPageMenuItemProvider.class.php
index 825632e934..3334d8cf5f 100644
--- a/wcfsetup/install/files/lib/system/menu/page/IPageMenuItemProvider.class.php
+++ b/wcfsetup/install/files/lib/system/menu/page/IPageMenuItemProvider.class.php
@@ -23,7 +23,14 @@ interface IPageMenuItemProvider extends IDatabaseObjectProcessor {
 	/**
 	 * Returns the number of notifications for the associated menu item.
 	 * 
-	 * @return	boolean
+	 * @return	integer
 	 */
 	public function getNotifications();
+	
+	/**
+	 * Returns the href of the associated menu item.
+	 *
+	 * @return	string
+	 */
+	public function getLink();
 }