From 46d7856196e9d763bc6764e4f9687d58bcc825de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Gro=C3=9Fberndt?= <stephan@grossberndt.de>
Date: Thu, 22 Oct 2015 10:48:42 +0200
Subject: [PATCH] [BUGFIX] Add favicon without scheme
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Remove the scheme when rendering the link to a favicon in order to
avoid mixed content because the cached header of a page is used for
both HTTP and HTTPS.
Resolves: #69665
Releases: master, 6.2
Change-Id: I39d51bcf31a98369645d144f670e4d6200c2402d
Reviewed-on: https://review.typo3.org/44213
Reviewed-by: Markus Sommer <markussom@posteo.de>
Reviewed-by: Steffen Müller <typo3@t3node.com>
Tested-by: Steffen Müller <typo3@t3node.com>
Reviewed-by: Richard Haeser <richardhaeser@gmail.com>
Tested-by: Richard Haeser <richardhaeser@gmail.com>
Reviewed-by: Michael Oehlhof <typo3@oehlhof.de>
Tested-by: Michael Oehlhof <typo3@oehlhof.de>
Reviewed-by: Marcus Schwemer <ms@schwemer.de>
Tested-by: Marcus Schwemer <ms@schwemer.de>
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
---
typo3/sysext/frontend/Classes/Page/PageGenerator.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/frontend/Classes/Page/PageGenerator.php b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
index a213277b496f..0e8f3f4581af 100644
--- a/typo3/sysext/frontend/Classes/Page/PageGenerator.php
+++ b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
@@ -20,6 +20,7 @@ use TYPO3\CMS\Core\Type\File\ImageInfo;
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
+use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Extbase\Service\TypoScriptService;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
@@ -398,7 +399,7 @@ class PageGenerator
$pageRenderer->setBaseUrl($tsfe->baseUrl);
}
if ($tsfe->pSetup['shortcutIcon']) {
- $favIcon = $tsfe->tmpl->getFileName($tsfe->pSetup['shortcutIcon']);
+ $favIcon = ltrim($tsfe->tmpl->getFileName($tsfe->pSetup['shortcutIcon']), '/');
$iconFileInfo = GeneralUtility::makeInstance(ImageInfo::class, PATH_site . $favIcon);
if ($iconFileInfo->isFile()) {
$iconMimeType = $iconFileInfo->getMimeType();
@@ -406,7 +407,7 @@ class PageGenerator
$iconMimeType = ' type="' . $iconMimeType . '"';
$pageRenderer->setIconMimeType($iconMimeType);
}
- $pageRenderer->setFavIcon(GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . $favIcon);
+ $pageRenderer->setFavIcon(PathUtility::getAbsoluteWebPath($tsfe->absRefPrefix . $favIcon));
}
}
// Including CSS files
--
GitLab