It is better 'menu' + output of full fieldArray if DEVELOPER is defined.

[core.git] / inc / classes / main / menu / class_BaseMenu.php

diff --git a/inc/classes/main/menu/class_BaseMenu.php b/inc/classes/main/menu/class_BaseMenu.php
index 1f3512b62c0492dc5ad4a5cb9989d6da4acb8998..3e37de7d232e19e6cc59f5997477694b0be4001d 100644 (file)
--- a/inc/classes/main/menu/class_BaseMenu.php
+++ b/inc/classes/main/menu/class_BaseMenu.php
@@ -49,18 +49,18 @@ class BaseMenu extends BaseFrameworkSystem {
                // Load the menu template for all
                $templateInstance->loadMenuTemplate('generic_menu_entries');
 
-               // Get the 'page' from request instance
-               $page = $this->getApplicationInstance()->getRequestInstance()->getRequestElement('page');
+               // Get the 'command' from request instance
+               $command = $this->getApplicationInstance()->getRequestInstance()->getRequestElement('command');
 
                // If page is empty, choose default
-               if (empty($page)) {
+               if (empty($command)) {
                        // Use default page as none has been specified
-                       $page = $this->getConfigInstance()->getConfigEntry('default_' . $this->getApplicationInstance()->getAppShortName() . '_' . self::getResponseTypeFromSystem() . '_command');
+                       $command = $this->getConfigInstance()->getConfigEntry('default_' . $this->getApplicationInstance()->getAppShortName() . '_' . self::getResponseTypeFromSystem() . '_command');
                } // END - if
 
                // Load the menu template for this page
                try {
-                       $templateInstance->loadMenuTemplate($page . '_menu_entries');
+                       $templateInstance->loadMenuTemplate($command . '_menu_entries');
                } catch (FileIoException $e) {
                        // Log exception @TODO Maybe to intrusive?
                        self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: Exception caught: ' . $e->__toString() . ', with message: ' . $e->getMessage());
@@ -80,7 +80,7 @@ class BaseMenu extends BaseFrameworkSystem {
         */
        public function transferContentToTemplateEngine (CompileableTemplate $templateInstance) {
                // Assign menu content to variable
-               $templateInstance->assignVariable('menu_content', $this->getTemplateInstance()->getMenuContent());
+               $templateInstance->assignVariable('menu', $this->getTemplateInstance()->getMenuContent());
                //* DEBUG */ $templateInstance->debugInstance();
        }
 }