From 8d35c717b471b508dabca5a137ce619b0de046a9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Thu, 15 Nov 2018 13:46:11 +0100
Subject: [PATCH] Hide `.pageNavigationIcons` when there is no content

Fixes #2629
---
 com.woltlab.wcf/templates/pageNavbarTop.tpl               | 8 ++++++--
 .../files/js/WoltLabSuite/Core/Ui/Page/Menu/Main.js       | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/com.woltlab.wcf/templates/pageNavbarTop.tpl b/com.woltlab.wcf/templates/pageNavbarTop.tpl
index 4442996c88..7395b0829b 100644
--- a/com.woltlab.wcf/templates/pageNavbarTop.tpl
+++ b/com.woltlab.wcf/templates/pageNavbarTop.tpl
@@ -2,9 +2,13 @@
 	<div class="layoutBoundary">
 		{if $skipBreadcrumbs|empty}{include file='breadcrumbs'}{/if}
 		
+		{hascontent}
 		<ul class="pageNavigationIcons jsPageNavigationIcons">
-			{if $headerNavigation|isset}{@$headerNavigation}{/if}
-			{event name='navigationIcons'}
+			{content}
+				{if $headerNavigation|isset}{@$headerNavigation}{/if}
+				{event name='navigationIcons'}
+			{/content}
 		</ul>
+		{/hascontent}
 	</div>
 </div>
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/Main.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/Main.js
index ce069ef8aa..67ab0a443e 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/Main.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Page/Menu/Main.js
@@ -57,7 +57,7 @@ define(['Core', 'Language', 'Dom/Traverse', './Abstract'], function(Core, Langua
 				return true;
 			}
 			
-			_hasItems = _navigationList.childElementCount > 0;
+			_hasItems = _navigationList && _navigationList.childElementCount > 0;
 			
 			if (_hasItems) {
 				var item, link;
-- 
2.20.1