From 6670a9b69c136933b8fc688a1a7dad7d50ac40a0 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 17 Oct 2012 20:17:50 +0200
Subject: [PATCH] Fixed WCF::getPath() and redirect in WCFACP

---
 wcfsetup/install/files/lib/system/WCF.class.php    | 2 +-
 wcfsetup/install/files/lib/system/WCFACP.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;
-- 
2.20.1