From: Alexander Ebert Date: Sun, 13 Jan 2013 21:10:41 +0000 (+0100) Subject: Reverted 6235bc0 X-Git-Tag: 2.0.0_Beta_1~566^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=47d6ff255d5f6100bc3c6b899055f94373ffbc07;p=GitHub%2FWoltLab%2FWCF.git Reverted 6235bc0 --- diff --git a/wcfsetup/install/files/lib/system/io/TarWriter.class.php b/wcfsetup/install/files/lib/system/io/TarWriter.class.php index 9056f0b03a..4538beb6f7 100644 --- a/wcfsetup/install/files/lib/system/io/TarWriter.class.php +++ b/wcfsetup/install/files/lib/system/io/TarWriter.class.php @@ -143,8 +143,8 @@ class TarWriter extends Tar { protected function addFile($filename, $addDir, $removeDir) { $filename = FileUtil::unifyDirSeperator($filename); $storedFilename = $filename; - if (!empty($removeDir)) $storedFilename = StringUtil::replaceIgnoreCase(FileUtil::addTrailingSlash($removeDir), '', $filename); - if (!empty($addDir)) $storedFilename = FileUtil::addTrailingSlash($addDir) . FileUtil::removeLeadingSlash($storedFilename); + if (!empty($removeDir)) $storedFilename = StringUtil::replaceIgnoreCase($removeDir, '', $filename); + if (!empty($addDir)) $storedFilename = $addDir . $storedFilename; if (is_file($filename)) { // open file