From b4bb712cd51e378b90c6c1d8dc0792bfef6657e3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Sat, 7 Jul 2012 14:57:49 +0200 Subject: [PATCH] Fix ACP for users without admin.general.canUseAcp Fixes #552 --- wcfsetup/install/files/lib/system/WCFACP.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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(); -- 2.20.1