Fixed uninstall path

diff --git a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
index 9fe5af3b3d8e1fe6d9723efebf1db66c80ee12a4..6cf6fed0866a0cbdd3f38d17b3f1a121259a0dfc 100644 (file)
--- a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
@@ -116,34 +116,18 @@ class UninstallPackageAction extends InstallPackageAction {
                        $this->installation->nodeBuilder->purgeNodes();
                        $this->finalize();
                        
-                       // redirect to application if not already within one
-                       if (PACKAGE_ID == 1) {
-                               // select first installed application
-                               $sql = "SELECT          packageID
-                                       FROM            wcf".WCF_N."_package
-                                       WHERE           packageID <> 1
-                                                       AND isApplication = 1
-                                       ORDER BY        installDate ASC";
-                               $statement = WCF::getDB()->prepareStatement($sql, 1);
-                               $statement->execute();
-                               $row = $statement->fetchArray();
-                               $packageID = ($row === false) ? 1 : $row['packageID'];
-                       }
-                       else {
-                               $packageID = PACKAGE_ID;
-                       }
-                       
                        // get domain path
                        $sql = "SELECT  *
-                               FROM    wcf".WCF_N."_application
-                               WHERE   packageID = ?";
+                                       FROM    wcf".WCF_N."_application
+                                       WHERE   packageID = ?";
                        $statement = WCF::getDB()->prepareStatement($sql);
-                       $statement->execute([$packageID]);
+                       $statement->execute([1]);
                        
                        /** @var Application $application */
                        $application = $statement->fetchObject(Application::class);
                        
                        // build redirect location
+                       // do not use the LinkHandler here as it is sort of unreliable during WCFSetup
                        $location = $application->getPageURL() . 'acp/index.php?package-list/';
                        
                        // show success