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 06fab53f87684abd9bbbb0c8f5475728c01719da..66fa36581fa16fa6a525f28187a1682c47772e4b 100644 (file)
--- 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 6b490c5ee5123bdb1c384c4163894d63c8ce2414..d2f177b3dc96630ff29fb1776fbcbea8635af152 100644 (file)
--- 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;