Fixed frontend link in ACP menu

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index b9dd0e7c5368ba3186a2448163baf9b517f1ca02..b7409c7c616ca32efe326de4810903879b436ab7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -119,8 +119,10 @@
                                                        <li id="userMenu" class="dropdown">
                                                                <a class="dropdownToggle framed" data-toggle="userMenu">{event name='userAvatar'} {lang}wcf.user.userNote{/lang}</a>
                                                                <ul class="dropdownMenu">
-                                                                       <li><a href="../">FRONTEND</a></li>
-                                                                       <li class="dropdownDivider"></li>
+                                                                       {if PACKAGE_ID > 1}
+                                                                               <li><a href="{@$__wcf->getPageMenu()->getLandingPage()->getLink()}">{lang}wcf.global.toLandingPage{/lang}</a></li>
+                                                                               <li class="dropdownDivider"></li>
+                                                                       {/if}
                                                                        <li><a href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="WCF.System.Confirmation.show('{lang}wcf.user.logout.sure{/lang}', $.proxy(function (action) { if (action == 'confirm') window.location.href = $(this).attr('href'); }, this)); return false;">{lang}wcf.user.logout{/lang}</a></li>
                                                                </ul>
                                                        </li>

diff --git a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItem.class.php b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItem.class.php
index e3b4470ba5a6c17cac834c128a2c660674ea4711..ec4b6fdf6d7dc8f65cd00b979480b06d39ed10c3 100644 (file)
--- a/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItem.class.php
+++ b/wcfsetup/install/files/lib/data/page/menu/item/PageMenuItem.class.php
@@ -66,7 +66,7 @@ class PageMenuItem extends ProcessibleDatabaseObject implements ITreeMenuItem {
                }
                
                $this->parseController();
-               return LinkHandler::getInstance()->getLink($this->controller, array('application' => $this->application), WCF::getLanguage()->get($this->menuItemLink));
+               return LinkHandler::getInstance()->getLink($this->controller, array('application' => $this->application, 'forceFrontend' => true), WCF::getLanguage()->get($this->menuItemLink));
        }
        
        /**

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index e8f9dd5e2f5ae3557cdbe91b89ed71aa5161c1d2..5b83e959c890e974c1fd37787a3f2218cd301d4b 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1080,6 +1080,7 @@
                <item name="wcf.global.subject"><![CDATA[Betreff]]></item>
                <item name="wcf.global.thousandsSeparator"><![CDATA[.]]></item>
                <item name="wcf.global.title"><![CDATA[Titel]]></item>
+               <item name="wcf.global.toLandingPage"><![CDATA[Zur Seite]]></item>
                <item name="wcf.global.preview"><![CDATA[Vorschau]]></item>
                <item name="wcf.global.multiSelect"><![CDATA[Mehrfache Markierungen sind durch zusätzliches Drücken der Taste „Strg/Ctrl“ (Windows) oder „Befehl/Command“ (Mac OS) möglich.]]></item>
                <item name="wcf.global.page.jumpTo"><![CDATA[Gehe zu Seite]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 3a0e8f0a191dc8d8cb722d9e9080d9cf2fbb7b39..7d5fa43ac997ccf547a822fe39ba82eb67c7e181 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1080,6 +1080,7 @@
                <item name="wcf.global.subject"><![CDATA[Subject]]></item>
                <item name="wcf.global.thousandsSeparator"><![CDATA[,]]></item>
                <item name="wcf.global.title"><![CDATA[Title]]></item>
+               <item name="wcf.global.toLandingPage"><![CDATA[To Front Page]]></item>
                <item name="wcf.global.preview"><![CDATA[Preview]]></item>
                <item name="wcf.global.multiSelect"><![CDATA[Multiple items can be selected by holding the “Ctrl/Shift” key (Windows) or “Command” (Mac OS) key and clicking on the desired items.]]></item>
                <item name="wcf.global.page.jumpTo"><![CDATA[Go to Page]]></item>