From 68d8281fef49fc0de8d0afe74106491d5039837f Mon Sep 17 00:00:00 2001
From: Florian Schuhmann <Florian.Schuhmann@t-systems.com>
Date: Thu, 5 Dec 2019 10:39:37 +0100
Subject: [PATCH] [BUGFIX] Do not process original files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The existing ProcessedFiles identifier check must be adjusted,
since the default value is an empty string for entries that
uses the original file.
Resolves: #89716
Releases: master, 9.5
Change-Id: Iea68cfbc02da0872b14a5645d3a0d4d60263738c
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/62538
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
Reviewed-by: Steffen Frese <steffenf14@gmail.com>
Reviewed-by: Jörg Bösche <typo3@joergboesche.de>
Reviewed-by: Sascha Rademacher <sascha.rademacher+typo3@gmail.com>
Reviewed-by: Christian Eßl <indy.essl@gmail.com>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
---
typo3/sysext/core/Classes/Resource/ProcessedFile.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/core/Classes/Resource/ProcessedFile.php b/typo3/sysext/core/Classes/Resource/ProcessedFile.php
index 4a0b81e357c7..f8e85570288b 100644
--- a/typo3/sysext/core/Classes/Resource/ProcessedFile.php
+++ b/typo3/sysext/core/Classes/Resource/ProcessedFile.php
@@ -182,7 +182,7 @@ class ProcessedFile extends AbstractFile
*/
public function updateWithLocalFile($filePath)
{
- if ($this->identifier === null) {
+ if (empty($this->identifier)) {
throw new \RuntimeException('Cannot update original file!', 1350582054);
}
$processingFolder = $this->originalFile->getStorage()->getProcessingFolder($this->originalFile);
@@ -419,7 +419,7 @@ class ProcessedFile extends AbstractFile
*/
public function usesOriginalFile()
{
- return $this->identifier === null || $this->identifier === $this->originalFile->getIdentifier();
+ return empty($this->identifier) || $this->identifier === $this->originalFile->getIdentifier();
}
/**
--
GitLab