From: Tim Düsterhus Date: Wed, 18 Dec 2013 15:22:30 +0000 (+0100) Subject: Fix issue within attachment export in vBulletin 4 X-Git-Tag: 2.0.1~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1e8f7507057aa9caed91cb901830f6d5535feabc;p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.exporter.git Fix issue within attachment export in vBulletin 4 --- diff --git a/files/lib/system/exporter/VB3or4xExporter.class.php b/files/lib/system/exporter/VB3or4xExporter.class.php index bc21c31..ca45319 100644 --- a/files/lib/system/exporter/VB3or4xExporter.class.php +++ b/files/lib/system/exporter/VB3or4xExporter.class.php @@ -951,13 +951,13 @@ class VB3or4xExporter extends AbstractExporter { $file = $this->readOption('attachpath'); if (!StringUtil::startsWith($file, '/')) $file = realpath($this->fileSystemPath.$file); $file = FileUtil::addTrailingSlash($file); - $file .= $row['userid'].'/'.$row['attachmentid'].'.attach'; + $file .= $row['userid'].'/'.(isset($row['filedataid']) ? $row['filedataid'] : $row['attachmentid']).'.attach'; break; case self::ATTACHFILE_FILESYSTEM_SUBFOLDER: $file = $this->readOption('attachpath'); if (!StringUtil::startsWith($file, '/')) $file = realpath($this->fileSystemPath.$file); $file = FileUtil::addTrailingSlash($file); - $file .= implode('/', str_split($row['userid'])).'/'.$row['attachmentid'].'.attach'; + $file .= implode('/', str_split($row['userid'])).'/'.(isset($row['filedataid']) ? $row['filedataid'] : $row['attachmentid']).'.attach'; break; }