From f9badf9bf52d56c189f576572f9c6bb74db4e81b Mon Sep 17 00:00:00 2001
From: Mathias Brodala <mbrodala@pagemachine.de>
Date: Wed, 20 May 2015 12:21:18 +0200
Subject: [PATCH] [BUGFIX] Fix translated shortcut target in menus
This ensures that the target of translated "shortcut" pages is
properly available. Normally this value is lost due to language
overlay thus the original page record needs to be retrieved to
restore the original shortcut target.
Now it is possible to e.g. mark shortcut menu items as active
on translated pages.
Resolves: #67047
Related: #36822
Releases: master, 9.5
Change-Id: I2cabc252ba1936763d6cbe1fe0a093aa74f5a4e1
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/39630
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Benni Mack <benni@typo3.org>
Tested-by: Susanne Moog <look@susi.dev>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Susanne Moog <look@susi.dev>
---
.../Classes/ContentObject/Menu/AbstractMenuContentObject.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
index 76458b1dd29b..1c5b7fefbdca 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
@@ -399,7 +399,7 @@ abstract class AbstractMenuContentObject
$c_b++;
// If the beginning item has been reached.
if ($begin <= $c_b) {
- $this->menuArr[$c] = $data;
+ $this->menuArr[$c] = $this->determineOriginalShortcutPage($data);
$this->menuArr[$c]['isSpacer'] = $isSpacerPage;
$c++;
if ($maxItems && $c >= $maxItems) {
@@ -1340,7 +1340,7 @@ abstract class AbstractMenuContentObject
// Override url if current page is a shortcut
$shortcut = null;
if ((int)$this->menuArr[$key]['doktype'] === PageRepository::DOKTYPE_SHORTCUT && (int)$this->menuArr[$key]['shortcut_mode'] !== PageRepository::SHORTCUT_MODE_RANDOM_SUBPAGE) {
- $menuItem = $this->determineOriginalShortcutPage($this->menuArr[$key]);
+ $menuItem = $this->menuArr[$key];
try {
$shortcut = $tsfe->sys_page->getPageShortcut(
$menuItem['shortcut'],
--
GitLab