From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 20 May 2020 13:09:48 +0000 (+0200)
Subject: Merge branch '3.1' into 5.2
X-Git-Tag: 5.2.7~56
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ce88781915012d2848a5520cb23944c90ab025d6;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '3.1' into 5.2
---

ce88781915012d2848a5520cb23944c90ab025d6
diff --cc wcfsetup/install/files/acp/templates/menuList.tpl
index e40114bb8b,55d0dd0e52..002601bb28
--- a/wcfsetup/install/files/acp/templates/menuList.tpl
+++ b/wcfsetup/install/files/acp/templates/menuList.tpl
@@@ -55,8 -55,8 +55,8 @@@
  							
  							{event name='rowButtons'}
  						</td>
- 						<td class="columnID columnPageID">{@$menu->menuID}</td>
+ 						<td class="columnID columnMenuID">{@$menu->menuID}</td>
 -						<td class="columnTitle"><a href="{link controller='MenuEdit' id=$menu->menuID}{/link}">{lang}{$menu->title}{/lang}</a></td>
 +						<td class="columnTitle"><a href="{link controller='MenuEdit' id=$menu->menuID}{/link}">{$menu->getTitle()}</a></td>
  						<td class="columnDigits columnItems"><a href="{link controller='MenuItemList' id=$menu->menuID}{/link}">{#$menu->items}</a></td>
  						<td class="columnText columnPosition">{lang}wcf.acp.box.position.{@$menu->position}{/lang}</td>
  						<td class="columnDigits columnShowOrder">{#$menu->showOrder}</td>