Skip to content
Snippets Groups Projects
Commit dead9a1e authored by Christian Eßl's avatar Christian Eßl Committed by Georg Ringer
Browse files

[BUGFIX] Remove $scheme from LegacyLinkNotationConverter::resolve()

The code block using $scheme is never reached, because there is already
an elseif condition further above, that is true for all urls containing
":".

The last else block even states in the comment:
"special handling without a scheme"

Therefore the variable is removed to remove a bit of complexity from the
function.

Resolves: #90951
Releases: master, 9.5
Change-Id: I2bc9fe0c546cb946fc32789ee384c3c60ac7c1fa
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64077


Tested-by: default avatarTYPO3com <noreply@typo3.com>
Tested-by: default avatarBenni Mack <benni@typo3.org>
Tested-by: default avatarGeorg Ringer <georg.ringer@gmail.com>
Reviewed-by: default avatarBenni Mack <benni@typo3.org>
Reviewed-by: default avatarMarkus Klein <markus.klein@typo3.org>
Reviewed-by: default avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: default avatarGeorg Ringer <georg.ringer@gmail.com>
parent 2c2e2314
Branches
Tags
No related merge requests found
...@@ -67,8 +67,6 @@ class LegacyLinkNotationConverter ...@@ -67,8 +67,6 @@ class LegacyLinkNotationConverter
} }
$result = []; $result = [];
// Parse URL scheme
$scheme = parse_url($linkParameter, PHP_URL_SCHEME);
// Resolve FAL-api "file:UID-of-sys_file-record" and "file:combined-identifier" // Resolve FAL-api "file:UID-of-sys_file-record" and "file:combined-identifier"
if (stripos($linkParameter, 'file:') === 0) { if (stripos($linkParameter, 'file:') === 0) {
...@@ -137,12 +135,8 @@ class LegacyLinkNotationConverter ...@@ -137,12 +135,8 @@ class LegacyLinkNotationConverter
// url (external): If doubleSlash or if a '.' comes before a '/'. // url (external): If doubleSlash or if a '.' comes before a '/'.
if (!$isIdOrAlias && $isLocalFile !== 1 && $urlChar && (!$containsSlash || $urlChar < $fileChar)) { if (!$isIdOrAlias && $isLocalFile !== 1 && $urlChar && (!$containsSlash || $urlChar < $fileChar)) {
$result['type'] = LinkService::TYPE_URL; $result['type'] = LinkService::TYPE_URL;
if (!$scheme) { $result['url'] = 'http://' . $linkParameter;
$result['url'] = 'http://' . $linkParameter; // file (internal) or folder
} else {
$result['url'] = $linkParameter;
}
// file (internal) or folder
} elseif ($containsSlash || $isLocalFile) { } elseif ($containsSlash || $isLocalFile) {
$result = $this->getFileOrFolderObjectFromMixedIdentifier($linkParameter); $result = $this->getFileOrFolderObjectFromMixedIdentifier($linkParameter);
} else { } else {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment