From: RouL Date: Fri, 15 Jul 2011 19:13:04 +0000 (+0200) Subject: Fixed a bug with the deletion of the temp files X-Git-Tag: 2.0.0_Beta_1~2019^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=041dde39c01b96173c175b6512ad818ba3c70879;p=GitHub%2FWoltLab%2FWCF.git Fixed a bug with the deletion of the temp files TMP_DIR already includes the TMP_FILE_PREFIX during the installation, so it is not necessary to add it to the TMP_DIR. There was also an exception thrown caused by this and the files in the temp-filder weren't deleted. --- diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php index a10d638369..dd5c3e32c9 100644 --- a/wcfsetup/install/files/lib/system/WCFSetup.class.php +++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php @@ -1038,8 +1038,7 @@ class WCFSetup extends WCF { WCF::getTPL()->display('stepInstallPackages'); // delete tmp files - $directory = TMP_DIR.TMP_FILE_PREFIX.'/'; - $it = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory)); + $it = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(TMP_DIR)); while ($it->valid()) { // delete all files except directories and packages (required for post-wcfsetup installation) if (!$it->isDot() && !$it->isDir() && !preg_match('~\.tar(\.gz)?$~', $it->getSubPathName())) {