[BUGFIX] No submenus on rootpage (FluidTYPO3#1073)

pfeiferbit · Jul 22, 2016 · 51a65e2 · 51a65e2
1 parent 50f664f
commit 51a65e2
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Classes/ViewHelpers/Menu/AbstractMenuViewHelper.php b/Classes/ViewHelpers/Menu/AbstractMenuViewHelper.php
@@ -381,14 +381,14 @@ protected function renderItemLink(array $page)
     /**
      * @param null|integer $pageUid
      * @param integer $entryLevel
-     * @return integer
+     * @return null|integer
      */
-    protected function determinePageUid($pageUid = null, $entryLevel = 0)
+    protected function determineParentPageUid($pageUid = null, $entryLevel = 0)
     {
         $rootLineData = $this->pageService->getRootLine();
         if (null === $pageUid) {
             if (null !== $entryLevel) {
-                if (0 > $entryLevel) {
+                if ($entryLevel < 0) {
                     $entryLevel = count($rootLineData) - 1 + $entryLevel;
                 }
                 $pageUid = $rootLineData[$entryLevel]['uid'];
@@ -397,18 +397,20 @@ protected function determinePageUid($pageUid = null, $entryLevel = 0)
             }
         }
 
-        return (integer) $pageUid;
+        return $pageUid;
     }
 
     /**
      * @param null|integer $pageUid
      * @param integer $entryLevel
-     *
      * @return array
      */
     public function getMenu($pageUid = null, $entryLevel = 0)
     {
-        $pageUid = $this->determinePageUid($pageUid, $entryLevel);
+        $pageUid = $this->determineParentPageUid($pageUid, $entryLevel);
+        if ($pageUid === null) {
+            return [];
+        }
         $showHiddenInMenu = (boolean) $this->arguments['showHiddenInMenu'];
         $showAccessProtected = (boolean) $this->arguments['showAccessProtected'];
         $includeSpacers = (boolean) $this->arguments['includeSpacers'];