From: Tim Düsterhus <timwolla@arcor.de>
Date: Sat, 7 Jul 2012 12:57:49 +0000 (+0200)
Subject: Fix ACP for users without admin.general.canUseAcp
X-Git-Tag: 2.0.0_Beta_1~1030
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b4bb712cd51e378b90c6c1d8dc0792bfef6657e3;p=GitHub%2FWoltLab%2FWCF.git

Fix ACP for users without admin.general.canUseAcp

Fixes #552
---

diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php
index 6403d764d8..e76450ac4d 100644
--- a/wcfsetup/install/files/lib/system/WCFACP.class.php
+++ b/wcfsetup/install/files/lib/system/WCFACP.class.php
@@ -40,13 +40,14 @@ class WCFACP extends WCF {
 		$this->initTPL();
 		$this->initCronjobs();
 		$this->initBlacklist();
-		$this->initAuth();
 		$this->initCoreObjects();
 		
 		// prevent application loading during setup
 		if (PACKAGE_ID) {
 			$this->initApplications();
 		}
+		
+		$this->initAuth();
 	}
 	
 	/**
@@ -56,7 +57,7 @@ class WCFACP extends WCF {
 		// this is a work-around since neither RequestHandler
 		// nor RouteHandler are populated right now
 		$pathInfo = (isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : '';
-		if (empty($pathInfo) || !preg_match('~^/(ACPCaptcha|Login)/~', $pathInfo)) {
+		if (empty($pathInfo) || !preg_match('~^/(ACPCaptcha|Login|Logout)/~', $pathInfo)) {
 			if (WCF::getUser()->userID == 0) {
 				// build redirect path
 				$application = ApplicationHandler::getInstance()->getActiveApplication();