[BUGFIX] Prevent double encoding of link test in index search

Resolves: #88208 Releases: master, 9.5 Change-Id: I5ccf147f67de2a768fce344a33a8c6d80eece3f6 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/61972 Tested-by: TYPO3com <noreply@typo3.com> Tested-by: Daniel Goerz <daniel.goerz@posteo.de> Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>
TYPO3 · Oct 13, 2019 · 213c3d3 · 213c3d3
1 parent 311df41
commit 213c3d3
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
@@ -487,7 +487,7 @@ protected function compileSingleResultRow($row, $headerOnly = 0)
                 $copiedRow = $row;
                 unset($copiedRow['cHashParams']);
                 $title = $this->linkPageATagWrap(
-                    htmlspecialchars($title),
+                    $title,
                     $this->linkPage($row['page_id'], $copiedRow)
                 );
             }
@@ -504,7 +504,7 @@ protected function compileSingleResultRow($row, $headerOnly = 0)
                 }
             }
             $title = $this->linkPageATagWrap(
-                htmlspecialchars($title),
+                $title,
                 $this->linkPage($row['data_page_id'], $row, $markUpSwParams)
             );
         }
@@ -1636,11 +1636,17 @@ protected function preparePageLink(int $pageUid, array $row, array $urlParameter
      */
     protected function linkPageATagWrap(string $linkText, array $linkData): string
     {
-        $target = !empty($linkData['target']) ? 'target="' . htmlspecialchars($linkData['target']) . '"' : '';
-
-        return '<a href="' . htmlspecialchars($linkData['uri']) . '" ' . $target . '>'
-            . htmlspecialchars($linkText)
-            . '</a>';
+        $attributes = [
+            'href' => $linkData['uri']
+        ];
+        if (!empty($linkData['target'])) {
+            $attributes['target'] = $linkData['target'];
+        }
+        return sprintf(
+            '<a %s>%s</a>',
+            GeneralUtility::implodeAttributes($attributes, true),
+            htmlspecialchars($linkText, ENT_QUOTES | ENT_HTML5)
+        );
     }
 
     /**