Merge pull request #689 from hmspl/useShortcutUid

[BUGFIX] Using useShortcutUid should return shortcut url
FluidTYPO3 · Oct 6, 2014 · 95aa483 · 95aa483
2 parents c341622 + 35a7819
commit 95aa483
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Classes/ViewHelpers/Page/Menu/AbstractMenuViewHelper.php b/Classes/ViewHelpers/Page/Menu/AbstractMenuViewHelper.php
@@ -437,7 +437,7 @@ protected function getMenuItemEntry($page, $rootLine, array $parentPage = NULL)
 			}
 			if (TRUE === (boolean) $this->shouldUseShortcutUid()) {
 				// overwrite current page UID
-				$pageUid = $targetPage['uid'];
+				$page['uid'] = $targetPage['uid'];
 			}
 		}
 
@@ -451,8 +451,8 @@ protected function getMenuItemEntry($page, $rootLine, array $parentPage = NULL)
 		}
 
 		$page['hasSubPages'] = (0 < count($this->getSubmenu($submenuPid)));
-		$page['active'] = $this->isActive($pageUid, $rootLine, $originalPageUid);
-		$page['current'] = $this->isCurrent($pageUid);
+		$page['active'] = $this->isActive($page['uid'], $rootLine, $originalPageUid);
+		$page['current'] = $this->isCurrent($page['uid']);
 		$page['link'] = $this->getItemLink($page);
 		$page['linktext'] = $this->getItemTitle($page);
 		$page['class'] = implode(' ', $this->getItemClass($page));