Optimizing output of header.tpl when there is no valid acpMenu-item

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index b52b4a20028b2662a4b9c82abd17b91482e139ef..289639bb065481731904d25f66ea512182f78b86 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -142,18 +142,22 @@
                        </div>
                        <!-- /logo -->
                        
-                       <!-- main menu -->
-                       <nav id="mainMenu" class="mainMenu">
-                               {* work-around for unknown core-object during WCFSetup *}
-                               {if PACKAGE_ID}
-                                       <ul>
-                                               {foreach from=$__wcf->getACPMenu()->getMenuItems('') item=menuItem}
-                                                       <li data-menu-item="{$menuItem->menuItem}"><a>{lang}{@$menuItem->menuItem}{/lang}</a></li>
-                                               {/foreach}
-                                       </ul>
-                               {/if}
-                       </nav>
-                       <!-- /main menu -->
+                       {hascontent}
+                               <!-- main menu -->
+                               <nav id="mainMenu" class="mainMenu">
+                                       {* work-around for unknown core-object during WCFSetup *}
+                                       {if PACKAGE_ID}
+                                               <ul>
+                                                       {content}
+                                                               {foreach from=$__wcf->getACPMenu()->getMenuItems('') item=menuItem}
+                                                                       <li data-menu-item="{$menuItem->menuItem}"><a>{lang}{@$menuItem->menuItem}{/lang}</a></li>
+                                                               {/foreach}
+                                                       {/content}
+                                               </ul>
+                                       {/if}
+                               </nav>
+                               <!-- /main menu -->
+                       {/hascontent}
                        
                        <!-- header navigation -->
                        <nav class="navigation navigationHeader clearfix">
@@ -167,7 +171,7 @@
        <!-- /HEADER -->
        
        <!-- MAIN -->
-       <div id="main" class="layoutFluid{if $__wcf->user->userID} sidebarOrientationLeft{/if}">
+       <div id="main" class="layoutFluid{if PACKAGE_ID && $__wcf->getACPMenu()->getMenuItems('')|count} sidebarOrientationLeft{/if}">
                <div>
                        {hascontent}
                                <!-- SIDEBAR -->