From 2f34845726575338c7e094c62f2cddb8d0b6bed1 Mon Sep 17 00:00:00 2001 From: RouL Date: Sun, 17 Jul 2011 05:07:28 +0200 Subject: [PATCH] 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. --- wcfsetup/install/files/lib/system/WCFSetup.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php index 25e40835b3..47db97eeb6 100644 --- 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 { if ($foundDirectory = FileUtil::scanFolder(INSTALL_SCRIPT_DIR, "WCF.class.php", true)) { $foundDirectory = $wcfDir = FileUtil::unifyDirSeperator(dirname(dirname(dirname($foundDirectory))).'/'); + + if (dirname(dirname($wcfDir)).'/' == TMP_DIR) { + $foundDirectory = false; + $wcfDir = FileUtil::unifyDirSeperator(INSTALL_SCRIPT_DIR).'wcf/'; + } } else { $wcfDir = FileUtil::unifyDirSeperator(INSTALL_SCRIPT_DIR).'wcf/'; -- 2.20.1