From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sun, 6 Jan 2019 11:50:54 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.0_Alpha_1~367
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a357afb546b15f7cced9c7e1ce471aff7fcd61dd;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

a357afb546b15f7cced9c7e1ce471aff7fcd61dd
diff --cc com.woltlab.wcf/templates/pageMenuMobile.tpl
index 0ec8ab7086,0c14793974..b8e46fa1cb
--- a/com.woltlab.wcf/templates/pageMenuMobile.tpl
+++ b/com.woltlab.wcf/templates/pageMenuMobile.tpl
@@@ -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>