From 4ecb81cf7e70ca0a5698ab369e45a20b8c0bfac1 Mon Sep 17 00:00:00 2001
From: Franz Koch <typo3@elements-net.de>
Date: Mon, 15 Sep 2014 18:15:20 +0200
Subject: [PATCH] [BUGFIX] Don't prepend absolute image URLs
The ImageService->getImageUri() method always prepends the public URL of
the image object with a prefix, regardless whether the object already
returns a fully qualified URL. This can be the case when the FAL driver
is connecting a remote image storage that doesn't allow local processing
and requires the images to be loaded from the remote server.
Change-Id: Iac65bc93bc0d1c1cbeb2335b7e13fc2126b728b6
Resolves: #61617
Releases: 6.2, 6.3
Reviewed-on: http://review.typo3.org/32786
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Franz Koch <typo3@elements-net.de>
Reviewed-by: Alexander Opitz <opitz.alexander@googlemail.com>
Tested-by: Alexander Opitz <opitz.alexander@googlemail.com>
Reviewed-by: Stefan Froemken <froemken@gmail.com>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
---
typo3/sysext/extbase/Classes/Service/ImageService.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/extbase/Classes/Service/ImageService.php b/typo3/sysext/extbase/Classes/Service/ImageService.php
index 27448c8ba987..3001076a5135 100644
--- a/typo3/sysext/extbase/Classes/Service/ImageService.php
+++ b/typo3/sysext/extbase/Classes/Service/ImageService.php
@@ -65,13 +65,18 @@ class ImageService implements \TYPO3\CMS\Core\SingletonInterface {
* @api
*/
public function getImageUri(FileInterface $image) {
- if ($this->environmentService->isEnvironmentInFrontendMode()) {
+ $imageUrl = $image->getPublicUrl();
+
+ // no prefix in case of an already fully qualified URL (having a schema)
+ if (strpos($imageUrl, '://')) {
+ $uriPrefix = '';
+ } elseif ($this->environmentService->isEnvironmentInFrontendMode()) {
$uriPrefix = $GLOBALS['TSFE']->absRefPrefix;
} else {
$uriPrefix = '../';
}
- return $uriPrefix . $image->getPublicUrl();
+ return $uriPrefix . $imageUrl;
}
/**
--
GitLab