Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 6 Jan 2019 11:50:54 +0000 (12:50 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 6 Jan 2019 11:50:54 +0000 (12:50 +0100)
1  2 
com.woltlab.wcf/templates/accountManagement.tpl
com.woltlab.wcf/templates/login.tpl
com.woltlab.wcf/templates/pageHeaderUser.tpl
com.woltlab.wcf/templates/pageMenuMobile.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

Simple merge
index 0ec8ab70863d47ca703747b016040829d1a25106,0c14793974db79ffee408824f61739ef1ff97864..b8e46fa1cb488ef229c08cd54d0cf31028455597
@@@ -1,11 -1,10 +1,12 @@@
  {* main menu / page options / breadcrumbs *}
  <div id="pageMainMenuMobile" class="pageMainMenuMobile menuOverlayMobile" data-page-logo="{$__wcf->getStyleHandler()->getStyle()->getPageLogo()}">
        <ol class="menuOverlayItemList" data-title="{lang}wcf.menu.page{/lang}">
 +              {event name='menuBefore'}
 +              
                <li class="menuOverlayTitle">{lang}wcf.menu.page.navigation{/lang}</li>
                {foreach from=$__wcf->getBoxHandler()->getBoxByIdentifier('com.woltlab.wcf.MainMenu')->getMenu()->getMenuItemNodeList() item=menuItemNode}
-                       <li class="menuOverlayItem">
+                       {* Does not use `data-identifier` to prevent compatibility issues. See https://github.com/WoltLab/WCF/pull/2813 *}
+                       <li class="menuOverlayItem" data-mobile-identifier="{@$menuItemNode->identifier}">
                                {assign var=__outstandingItems value=$menuItemNode->getOutstandingItems()}
                                <a href="{$menuItemNode->getURL()}" class="menuOverlayItemLink{if $__outstandingItems} menuOverlayItemBadge{/if}{if $menuItemNode->isActiveNode()} active{/if}"{if $menuItemNode->isExternalLink() && EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>
                                        <span class="menuOverlayItemTitle">{lang}{$menuItemNode->title}{/lang}</span>
Simple merge
Simple merge