From 5e79b40c06f3d1b41cb837f8552fd274766cbc1d Mon Sep 17 00:00:00 2001 From: Olli Date: Mon, 12 Sep 2016 10:11:27 +0200 Subject: [PATCH 1/2] Changes vor > 7.6.2 https://forge.typo3.org/issues/71567 --- Classes/Domain/Model/FileReference.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Classes/Domain/Model/FileReference.php b/Classes/Domain/Model/FileReference.php index fff1101..c1845db 100644 --- a/Classes/Domain/Model/FileReference.php +++ b/Classes/Domain/Model/FileReference.php @@ -38,10 +38,11 @@ class FileReference extends \TYPO3\CMS\Extbase\Domain\Model\FileReference { protected $originalFileIdentifier; /** - * @param \TYPO3\CMS\Core\Resource\FileReference $originalResource - */ - public function setOriginalResource(\TYPO3\CMS\Core\Resource\FileReference $originalResource) { - $this->originalResource = $originalResource; - $this->originalFileIdentifier = (int)$originalResource->getOriginalFile()->getUid(); - } + * @param \TYPO3\CMS\Core\Resource\ResourceInterface $originalResource + */ + public function setOriginalResource(\TYPO3\CMS\Core\Resource\ResourceInterface $originalResource) + { + $this->originalResource = $originalResource; + $this->originalFileIdentifier = (int)$originalResource->getOriginalFile()->getUid(); + } } From 7cdafc0038905ab9b87e7899bbde17d1a3fc3fa9 Mon Sep 17 00:00:00 2001 From: Olli Date: Thu, 15 Sep 2016 15:44:57 +0200 Subject: [PATCH 2/2] add check to avoid a potential fatal error --- Classes/Domain/Model/FileReference.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Classes/Domain/Model/FileReference.php b/Classes/Domain/Model/FileReference.php index c1845db..fea0d11 100644 --- a/Classes/Domain/Model/FileReference.php +++ b/Classes/Domain/Model/FileReference.php @@ -43,6 +43,8 @@ class FileReference extends \TYPO3\CMS\Extbase\Domain\Model\FileReference { public function setOriginalResource(\TYPO3\CMS\Core\Resource\ResourceInterface $originalResource) { $this->originalResource = $originalResource; - $this->originalFileIdentifier = (int)$originalResource->getOriginalFile()->getUid(); + if(is_a($originalResource,'\TYPO3\CMS\Core\Resource\FileReference')){ + $this->originalFileIdentifier = (int)$originalResource->getOriginalFile()->getUid(); + } } }