Fixed detection of an installed wcf during the installation

Fixed a bug that recognized the installation files in a nested
tmp-directory as an already installed WCF instance at the "choose
folder" page.

diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index 25e40835b3c0154bfb8981bbaddb5ccbe0a2892b..47db97eeb64f3a4c21b08636ea37499d9609997f 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -382,6 +382,11 @@ class WCFSetup extends WCF {
                else {\r
                        if ($foundDirectory = FileUtil::scanFolder(INSTALL_SCRIPT_DIR, "WCF.class.php", true)) {\r
                                $foundDirectory = $wcfDir = FileUtil::unifyDirSeperator(dirname(dirname(dirname($foundDirectory))).'/');\r
+                               \r
+                               if (dirname(dirname($wcfDir)).'/' == TMP_DIR) {\r
+                                       $foundDirectory = false;\r
+                                       $wcfDir = FileUtil::unifyDirSeperator(INSTALL_SCRIPT_DIR).'wcf/';\r
+                               }\r
                        }\r
                        else {\r
                                $wcfDir = FileUtil::unifyDirSeperator(INSTALL_SCRIPT_DIR).'wcf/';\r