Fixed ACP logo

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index a7b967b28837aa072d19f3f6775538fdbdcb75d7..bfeb535502d5d456b5f4ca7dda85462b600f89ef 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -136,12 +136,16 @@
                        <div id="logo" class="logo">
                                <a href="{link controller='Index'}{/link}">
                                        <h1>{lang}wcf.global.acp{/lang}</h1>
-                                       <img src="{@$__wcf->getPath()}acp/images/wcfLogo1.svg" width="321" height="58" alt="" />
+                                       {if PACKAGE_ID > 1}
+                                               {event name='headerLogo'}
+                                       {else}
+                                               <img src="{@$__wcf->getPath()}acp/images/wcfLogo2.svg" alt="" width="300" height="58" />
+                                       {/if}
                                </a>
                        </div>
                        
                        {* work-around for unknown core-object during WCFSetup *}
-                       {if PACKAGE_ID}
+                       {if PACKAGE_ID && $__wcf->user->userID}
                                {hascontent}
                                        <nav id="mainMenu" class="mainMenu">
                                                <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>
@@ -158,14 +162,14 @@
                </div>
        </header>
        
-       <div id="main" class="layoutFluid{if PACKAGE_ID && $__wcf->getACPMenu()->getMenuItems('')|count} sidebarOrientationLeft{/if}">
+       <div id="main" class="layoutFluid{if PACKAGE_ID && $__wcf->user->userID && $__wcf->getACPMenu()->getMenuItems('')|count} sidebarOrientationLeft{/if}">
                <div>
                        {hascontent}
                                <aside class="sidebar collapsibleMenu">
                                        <div>
                                                {content}
                                                        {* work-around for unknown core-object during WCFSetup *}
-                                                       {if PACKAGE_ID}
+                                                       {if PACKAGE_ID && $__wcf->user->userID}
                                                                {foreach from=$__wcf->getACPMenu()->getMenuItems('') item=_parentMenuItem}
                                                                        <div id="{$_parentMenuItem->menuItem}-container" style="display: none;" class="menuGroup collapsibleMenus" data-parent-menu-item="{$_parentMenuItem->menuItem}">
                                                                                {foreach from=$__wcf->getACPMenu()->getMenuItems($_parentMenuItem->menuItem) item=_menuItem}

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 8146c157fc1273461fb4e4d562b532aa8b882bbc..79b8bf7c840c4d9ca29cfa9374e3a9030926a349 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -467,15 +467,15 @@ class WCF {
                                throw new SystemException('Unable to load configuration for '.$package->package);
                        }
                        
-                       // start application if not within ACP
+                       // register template path if not within ACP
                        if (!class_exists('wcf\system\WCFACP', false)) {
                                // add template path and abbreviation
                                $this->getTPL()->addApplication($abbreviation, $packageDir . 'templates/');
-                               
-                               // init application and assign it as template variable
-                               $applicationObject = call_user_func(array($className, 'getInstance'));
-                               $this->getTPL()->assign('__'.$abbreviation, $applicationObject);
                        }
+                       
+                       // init application and assign it as template variable
+                       $applicationObject = call_user_func(array($className, 'getInstance'));
+                       $this->getTPL()->assign('__'.$abbreviation, $applicationObject);
                }
                else {
                        unset(self::$autoloadDirectories[$abbreviation]);