From: Alexander Ebert Date: Wed, 17 Oct 2012 18:17:50 +0000 (+0200) Subject: Fixed WCF::getPath() and redirect in WCFACP X-Git-Tag: 2.0.0_Beta_1~853 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6670a9b69c136933b8fc688a1a7dad7d50ac40a0;p=GitHub%2FWoltLab%2FWCF.git Fixed WCF::getPath() and redirect in WCFACP --- diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php index 06fab53f87..66fa36581f 100644 --- a/wcfsetup/install/files/lib/system/WCF.class.php +++ b/wcfsetup/install/files/lib/system/WCF.class.php @@ -617,7 +617,7 @@ class WCF { $abbreviation = 'wcf'; } - return self::$applications[$abbreviation]->domainName . self::$applications[$abbreviation]->domainPath; + return self::$applications[$abbreviation]->getPageURL(); } /** diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php index 6b490c5ee5..d2f177b3dc 100644 --- a/wcfsetup/install/files/lib/system/WCFACP.class.php +++ b/wcfsetup/install/files/lib/system/WCFACP.class.php @@ -63,7 +63,7 @@ class WCFACP extends WCF { if (WCF::getUser()->userID == 0) { // build redirect path $application = ApplicationHandler::getInstance()->getActiveApplication(); - $path = $application->domainName . $application->domainPath . 'acp/index.php/Login/' . SID_ARG_1ST; + $path = $application->getPageURL() . 'acp/index.php/Login/' . SID_ARG_1ST; util\HeaderUtil::redirect($path, false); exit;