From: RouL <roul@codingcorner.info>
Date: Sun, 17 Jul 2011 03:07:28 +0000 (+0200)
Subject: Fixed detection of an installed wcf during the installation
X-Git-Tag: 2.0.0_Beta_1~2004^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2f34845726575338c7e094c62f2cddb8d0b6bed1;p=GitHub%2FWoltLab%2FWCF.git

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 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/';