From 52e88b7a68fde39ad37d96fde326090e4f3f596b Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver@typo3.org>
Date: Mon, 9 Apr 2018 20:11:50 +0200
Subject: [PATCH] [BUGFIX] Handle empty absRefPrefix in PageLinkBuilder
Using empty values for absRefPrefix as needle in strpos() will
throw a warning. In order to avoid that, it's now checked more
explicitly if the prefixed slash originally was absRefPrefix.
Resolves: #84676
Releases: master
Change-Id: I7515e8d283b2d68e39f7a0451432d453471088f0
Reviewed-on: https://review.typo3.org/56616
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Susanne Moog <susanne.moog@typo3.org>
Tested-by: Susanne Moog <susanne.moog@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
typo3/sysext/frontend/Classes/Typolink/PageLinkBuilder.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/typo3/sysext/frontend/Classes/Typolink/PageLinkBuilder.php b/typo3/sysext/frontend/Classes/Typolink/PageLinkBuilder.php
index 363c31eefb43..7c973a7a1eda 100644
--- a/typo3/sysext/frontend/Classes/Typolink/PageLinkBuilder.php
+++ b/typo3/sysext/frontend/Classes/Typolink/PageLinkBuilder.php
@@ -559,7 +559,7 @@ class PageLinkBuilder extends AbstractTypolinkBuilder
// $totalUri contains /index.php for legacy URLs, as previously "it was index.php"
// In case an URI has is prefixed with "/" which is not the absRefPrefix, remove it.
// this might change in the future
- if (strpos($totalUrl, '/index.php') === 0 && strpos($totalUrl, $absRefPrefix) !== 0) {
+ if (strpos($totalUrl, '/index.php') === 0 && $absRefPrefix !== '/') {
$totalUrl = substr($totalUrl, 1);
}
--
GitLab