remove showMainMenu() calls

Admidio · Jul 31, 2019 · 0d49ef7 · 0d49ef7
1 parent 527fa77
commit 0d49ef7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/adm_program/index.php b/adm_program/index.php
@@ -61,6 +61,6 @@
 }
 
 // display Menu
-$page->addHtml($page->showMainMenu());
+$page->addHtml($gMenu->getHtml(true));
 
 $page->show();
diff --git a/adm_program/system/classes/HtmlPage.php b/adm_program/system/classes/HtmlPage.php
@@ -431,7 +431,7 @@ public function getHeadline()
     private function getFileContent($filename)
     {
         global $gLogger, $gL10n, $gDb, $gCurrentSession, $gCurrentOrganization, $gCurrentUser;
-        global $gValidLogin, $gProfileFields, $gHomepage, $gSettingsManager;
+        global $gValidLogin, $gProfileFields, $gHomepage, $gSettingsManager, $gMenu;
 
         $filePath = THEME_PATH . '/' . $filename;
         if (!is_file($filePath))
@@ -576,15 +576,12 @@ private function getHtmlHeader()
      */
     private function getHtmlBody()
     {
-        $htmlMenu         = '';
         $htmlHeadline     = '';
 
         if ($this->showMenu)
         {
-            // add modules and administration modules to the menu
-            $this->showMainMenu();
+            // add mobile menu
             $this->addModalMenu();
-            $htmlMenu = $this->menu->show();
         }
 
         if ($this->headline !== '')
@@ -603,7 +600,6 @@ private function getHtmlBody()
         $htmlBody .= $this->htmlMyBodyTop;
         $htmlBody .= '<div class="admidio-content">';
         $htmlBody .= $htmlHeadline;
-        $htmlBody .= $htmlMenu;
         $htmlBody .= $this->pageContent;
         $htmlBody .= '</div>';
         $htmlBody .= $this->htmlMyBodyBottom;

diff --git a/adm_themes/modern/my_body_bottom.php b/adm_themes/modern/my_body_bottom.php
@@ -13,10 +13,7 @@
                 require(ADMIDIO_PATH . FOLDER_PLUGINS . '/latest-documents-files/index.php');
                 require(ADMIDIO_PATH . FOLDER_PLUGINS . '/random_photo/random_photo.php');
 
-                // create html page object and display Menu
-                $page = new HtmlPage();
-                echo $page->showMainMenu(false);
-
+                echo $gMenu->getHtml();
                 ?>
             </div><!-- closes "div#right-block" -->
         </div><!-- closes "div.col-md-3" -->