projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8baa233)
Fixed an error in the header menu
authorMarcel Werk <burntime@woltlab.com>
Thu, 28 Jul 2011 11:39:28 +0000 (13:39 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 28 Jul 2011 11:39:28 +0000 (13:39 +0200)
com.woltlab.wcf/templates/documentHeader.tpl patch | blob | blame | history
com.woltlab.wcf/templates/headerMenu.tpl patch | blob | blame | history
wcfsetup/install/files/lib/system/menu/page/DefaultPageMenuItemProvider.class.php patch | blob | blame | history

diff --git a/com.woltlab.wcf/templates/documentHeader.tpl b/com.woltlab.wcf/templates/documentHeader.tpl
index fc49ada05df7ca8444c7d3b0f0e2eb2bba1fb69e..2761da7cbc7a2a36c9fc0acec0d9d019b774f36b 100644 (file)
--- a/com.woltlab.wcf/templates/documentHeader.tpl
+++ b/com.woltlab.wcf/templates/documentHeader.tpl
@@ -1,2 +1,2 @@
 <!DOCTYPE html>
-<html dir="{lang}wcf.global.pageDirection{/lang}" lang="{@LANGUAGE_CODE}">
+<html dir="{lang}wcf.global.pageDirection{/lang}" lang="{@$__wcf->language->getFixedLanguageCode()}">
diff --git a/com.woltlab.wcf/templates/headerMenu.tpl b/com.woltlab.wcf/templates/headerMenu.tpl
index 6b4bf7d5d26f1b2b25cf91e455767e214f711f8d..d7c1c9dfda010a4be85c5b25591d76289cdca54e 100644 (file)
--- a/com.woltlab.wcf/templates/headerMenu.tpl
+++ b/com.woltlab.wcf/templates/headerMenu.tpl
@@ -3,12 +3,12 @@
                <div class="mainMenuInner">
                        <ul>
                                {foreach from=$__wcf->getPageMenu()->getMenuItems('header') item=menuItem}
-                                       <li><a href="{$menuItem->menuItemLink}">{$menuItem->menuItem} ({#$menuItem->getProvider()->getNotifications()})</a>
+                                       <li><a href="{$menuItem->menuItemLink}">{$menuItem->menuItem} ({#$menuItem->getProcessor()->getNotifications()})</a>
                                        
                                        {if $__wcf->getPageMenu()->getMenuItems($menuItem->menuItem)|count > 0}
                                                <ul>
                                                        {foreach from=$__wcf->getPageMenu()->getMenuItems($menuItem->menuItem) item=subMenuItem}
-                                                               <li><a href="{$subMenuItem->menuItemLink}">{$subMenuItem->menuItem} ({#$subMenuItem->getProvider()->getNotifications()})</a></li>
+                                                               <li><a href="{$subMenuItem->menuItemLink}">{$subMenuItem->menuItem} ({#$subMenuItem->getProcessor()->getNotifications()})</a></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 c4a71880ec7eb40656232af92990bf7075f5f1ac..38e379687e762602e1bda7cbae9c52e82ed7d5a5 100644 (file)
--- a/wcfsetup/install/files/lib/system/menu/page/DefaultPageMenuItemProvider.class.php
+++ b/wcfsetup/install/files/lib/system/menu/page/DefaultPageMenuItemProvider.class.php
@@ -13,6 +13,11 @@ use wcf\data\DatabaseObjectDecorator;
  * @category   Community Framework
  */
 class DefaultPageMenuItemProvider extends DatabaseObjectDecorator implements IPageMenuItemProvider {
+       /**
+        * @see wcf\data\DatabaseObjectDecorator::$baseClass
+        */
+       protected static $baseClass = 'wcf\data\page\menu\item\PageMenuItem';
+       
        /**
         * @see wcf\system\menu\page\IPageMenuItemProvider::isVisible()
         */
WoltLab Suite Core (previously WoltLab Community Framework)