diff --git a/src/controllers/FilesController.php b/src/controllers/FilesController.php index 9e4918ba..a6defc1a 100644 --- a/src/controllers/FilesController.php +++ b/src/controllers/FilesController.php @@ -230,7 +230,8 @@ public function actionImportFile() $fileInfo = pathinfo($filename); - $folder = Craft::$app->getAssets()->getUserTemporaryUploadFolder(); + $uploadVolumeId = ArrayHelper::getValue(Translations::getInstance()->getSettings(), 'uploadVolume'); + $folder = $this->getFolderByVolumeId($uploadVolumeId); $pathInfo = pathinfo($file); @@ -311,7 +312,8 @@ public function actionImportFile() } else { $filename = Assets::prepareAssetName($file->name); - $folder = Craft::$app->getAssets()->getUserTemporaryUploadFolder(); + $uploadVolumeId = ArrayHelper::getValue(Translations::getInstance()->getSettings(), 'uploadVolume'); + $folder = $this->getFolderByVolumeId($uploadVolumeId); $compatibleFilename = $file->tempName . '.' . Constants::FILE_FORMAT_TXT; @@ -576,4 +578,12 @@ private function getZipName($order) { return $zip_name; } + + private function getFolderByVolumeId($volumeId) { + if ($volumeId == 0) { + return Craft::$app->getAssets()->getUserTemporaryUploadFolder(); + } else { + return Craft::$app->getAssets()->getRootFolderByVolumeId($volumeId); + } + } }