[BUGFIX] Correctly render menu link for translated shortcuts

This patch ensure that we only use the shortcut target of the default
language if the shortcut mode is identical to the one of translated page.

Releases: master, 6.2
Resolves: #62189
Change-Id: Ic405c562aee4d09fb8156d403b588562c0b2fa4a
Reviewed-on: http://review.typo3.org/37841
Reviewed-by: Stephan Großberndt <stephan@grossberndt.de>
Reviewed-by: Frank Nägler <typo3@naegler.net>
Tested-by: Frank Nägler <typo3@naegler.net>
Reviewed-by: Jan Helke <typo3@helke.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>

diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
index b1c94f8..acd04aa 100644 (file)
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
@@ -1654,7 +1654,7 @@ abstract class AbstractMenuContentObject {
                        // Using raw record since the record was overlaid and is correct already:
                        $originalPage = $this->sys_page->getRawRecord('pages', $page['uid']);
 
-                       if (!empty($originalPage['shortcut'])) {
+                       if ($originalPage['shortcut_mode'] === $page['shortcut_mode'] && !empty($originalPage['shortcut'])) {
                                $page['shortcut'] = $originalPage['shortcut'];
                        }
                }