From 19d6e38f75904fd7212b2ff114d2a69ebafe2f16 Mon Sep 17 00:00:00 2001
From: Xavier Perseguers <xavier@typo3.org>
Date: Thu, 20 Mar 2014 12:52:57 +0100
Subject: [PATCH] [BUGFIX] Invalid file used to compute image ratio in text
with picture
Fixes: #57075
Releases: 6.2
Change-Id: Ided1204857dabf4fb15045056cc8a14010a53ae9
Reviewed-on: https://review.typo3.org/28558
Reviewed-by: Marc Bastian Heinrichs
Tested-by: Marc Bastian Heinrichs
Reviewed-by: Markus Klein
Tested-by: Markus Klein
---
.../Classes/Controller/CssStyledContentController.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php b/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
index 527c7d440bfe..d44b99d799df 100644
--- a/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
+++ b/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
@@ -590,7 +590,12 @@ class CssStyledContentController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlug
/** @var $file \TYPO3\CMS\Core\Resource\File */
if (MathUtility::canBeInterpretedAsInteger($imgs[$imgKey])) {
- $file = $this->getResourceFactory()->getFileObject((int)$imgs[$imgKey]);
+ if ($imgListContainsReferenceUids) {
+ $file = $this->getResourceFactory()->getFileReferenceObject((int)$imgs[$imgKey])->getOriginalFile();
+ } else {
+ $file = $this->getResourceFactory()->getFileObject((int)$imgs[$imgKey]);
+ }
+
} else {
$file = $this->getResourceFactory()->getFileObjectFromCombinedIdentifier($imgPath . $imgs[$imgKey]);
}
--
GitLab