From 8687bab5312b9bd7136adbbf9b1015fbc59b6324 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Mon, 3 Apr 2017 09:55:52 +0200
Subject: [PATCH] [BUGFIX] Only output href attribute once in typolink()
When lib.parseFunc_RTE is set for ATagParams = data:allParams
for rendering anchor tags, href="" is added twice.
Anchor tags filter out additional href="" tags.
Resolves: #80373
Releases: master
Change-Id: Ie5c0124f6f5dcd96d41b230e11d8317febaebe30
Reviewed-on: https://review.typo3.org/52323
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
---
.../ContentObject/ContentObjectRenderer.php | 13 ++++-
.../ContentObjectRendererTest.php | 50 +++++++++++++++++++
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index 6038dfcadfed..82cfecb95ee4 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -5606,6 +5606,15 @@ class ContentObjectRenderer
'TYPE' => $linkDetails['type']
];
+ // Ensure "href" is not in the list of aTagParams to avoid double tags, usually happens within buggy parseFunc settings
+ if (!empty($finalTagParts['aTagParams'])) {
+ $aTagParams = GeneralUtility::get_tag_attributes($finalTagParts['aTagParams']);
+ if (isset($aTagParams['href'])) {
+ unset($aTagParams['href']);
+ $finalTagParts['aTagParams'] = GeneralUtility::implodeAttributes($aTagParams);
+ }
+ }
+
// Building the final <a href=".."> tag
$tagAttributes = [];
@@ -5660,7 +5669,9 @@ class ContentObjectRenderer
$tagAttributes['class'] = htmlspecialchars($resolvedLinkParameters['class']);
}
- $finalAnchorTag = '<a ' . GeneralUtility::implodeAttributes($tagAttributes) . $finalTagParts['aTagParams'] . '>';
+ // Prevent trouble with double and missing spaces between attributes and merge params before implode
+ $finalTagAttributes = array_merge($tagAttributes, GeneralUtility::get_tag_attributes($finalTagParts['aTagParams']));
+ $finalAnchorTag = '<a ' . GeneralUtility::implodeAttributes($finalTagAttributes) . '>';
if (!empty($finalTagParts['aTagParams'])) {
$tagAttributes = array_merge($tagAttributes, GeneralUtility::get_tag_attributes($finalTagParts['aTagParams']));
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
index 98f026a7169a..e2b8171a1731 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
@@ -2747,6 +2747,56 @@ class ContentObjectRendererTest extends \TYPO3\TestingFramework\Core\Unit\UnitTe
],
'<a href="fileadmin/foo.bar" title="Title of the file" target="_blank" class="file-class">My file</a>',
],
+ 'Link to file with attributes and additional href' => [
+ 'My file',
+ [
+ 'parameter' => 'fileadmin/foo.bar',
+ 'ATagParams' => 'href="foo-bar"',
+ 'fileTarget' => '_blank',
+ 'title' => 'Title of the file',
+ ],
+ '<a href="fileadmin/foo.bar" title="Title of the file" target="_blank">My file</a>',
+ ],
+ 'Link to file with attributes and additional href and class' => [
+ 'My file',
+ [
+ 'parameter' => 'fileadmin/foo.bar',
+ 'ATagParams' => 'href="foo-bar" class="file-class"',
+ 'fileTarget' => '_blank',
+ 'title' => 'Title of the file',
+ ],
+ '<a href="fileadmin/foo.bar" title="Title of the file" target="_blank" class="file-class">My file</a>',
+ ],
+ 'Link to file with attributes and additional class and href' => [
+ 'My file',
+ [
+ 'parameter' => 'fileadmin/foo.bar',
+ 'ATagParams' => 'class="file-class" href="foo-bar"',
+ 'fileTarget' => '_blank',
+ 'title' => 'Title of the file',
+ ],
+ '<a href="fileadmin/foo.bar" title="Title of the file" target="_blank" class="file-class">My file</a>',
+ ],
+ 'Link to file with attributes and additional class and href and title' => [
+ 'My file',
+ [
+ 'parameter' => 'fileadmin/foo.bar',
+ 'ATagParams' => 'class="file-class" href="foo-bar" title="foo-bar"',
+ 'fileTarget' => '_blank',
+ 'title' => 'Title of the file',
+ ],
+ '<a href="fileadmin/foo.bar" title="foo-bar" target="_blank" class="file-class">My file</a>',
+ ],
+ 'Link to file with attributes and empty ATagParams' => [
+ 'My file',
+ [
+ 'parameter' => 'fileadmin/foo.bar',
+ 'ATagParams' => '',
+ 'fileTarget' => '_blank',
+ 'title' => 'Title of the file',
+ ],
+ '<a href="fileadmin/foo.bar" title="Title of the file" target="_blank">My file</a>',
+ ],
'Link to file with attributes in parameter' => [
'My file',
[
--
GitLab