From c5d57feb633451f3d478fdda9c9738daf523ca11 Mon Sep 17 00:00:00 2001
From: Frans Saris <franssaris@gmail.com>
Date: Tue, 27 Feb 2018 17:07:25 +0100
Subject: [PATCH] [BUGFIX] Initiate correct storage of processed file during
 reconstitution

Releases: master, 8.7
Resolves: #84069
Change-Id: Idd642770341ddd5513c650e5ae230bcb5e7e6824
Reviewed-on: https://review.typo3.org/55927
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Wolfgang Klinger <wolfgang@wazum.com>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
---
 typo3/sysext/core/Classes/Resource/ProcessedFile.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/typo3/sysext/core/Classes/Resource/ProcessedFile.php b/typo3/sysext/core/Classes/Resource/ProcessedFile.php
index b97fd110fc05..711962045a89 100644
--- a/typo3/sysext/core/Classes/Resource/ProcessedFile.php
+++ b/typo3/sysext/core/Classes/Resource/ProcessedFile.php
@@ -129,7 +129,6 @@ public function __construct(File $originalFile, $taskType, array $processingConf
      * Creates a ProcessedFile object from a database record.
      *
      * @param array $databaseRow
-     * @return ProcessedFile
      */
     protected function reconstituteFromDatabaseRecord(array $databaseRow)
     {
@@ -140,6 +139,10 @@ protected function reconstituteFromDatabaseRecord(array $databaseRow)
         $this->identifier = $databaseRow['identifier'];
         $this->name = $databaseRow['name'];
         $this->properties = $databaseRow;
+
+        if (!empty($databaseRow['storage']) && (int)$this->storage->getUid() !== (int)$databaseRow['storage']) {
+            $this->storage = ResourceFactory::getInstance()->getStorageObject($databaseRow['storage']);
+        }
     }
 
     /********************************