From 0876af5808b2e202498b037af5785ed3771c0aeb Mon Sep 17 00:00:00 2001 From: Dragan Tomic Date: Mon, 5 Dec 2016 15:43:36 +0100 Subject: [PATCH] [BUGFIX] Read storage from current object for File replace, don't use hard coded value --- typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php index 9006597..6b77381 100644 --- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php +++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php @@ -1072,8 +1072,11 @@ class ExtendedFileUtility extends \TYPO3\CMS\Core\Utility\File\BasicFileUtility /** @var $fileObject File */ $fileObject = $this->getFileObject($combinedIdentifier); + // reading Storage from file, use default as a fallback + $fileStorageUid = $fileObject ? $fileObject->getStorage()->getUid() : \TYPO3\CMS\Core\Resource\ResourceFactory::getDefaultStorage(); + $resourceFactory = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Resource\\ResourceFactory'); - $folder = $resourceFactory->getFolderObjectFromCombinedIdentifier('1:'.$fileObject->getParentFolder()->getIdentifier()); + $folder = $resourceFactory->getFolderObjectFromCombinedIdentifier(trim($fileStorageUid . ':' . $fileObject->getParentFolder()->getIdentifier())); try { $checkFile = $resourceFactory->retrieveFileOrFolderObject($folder->getCombinedIdentifier().''.$fileInfo['name']); -- 2.2.1