X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fmenu%2Fclass_BaseMenu.php;h=7bb97e169a27674ddfb3f9d3c31dc4ac54d75cf3;hp=1f3512b62c0492dc5ad4a5cb9989d6da4acb8998;hb=b1683de32141e80fb17d5ff1a6f460186e22d961;hpb=b9150fa200886f629ea33f37e06690ee56292972

diff --git a/inc/classes/main/menu/class_BaseMenu.php b/inc/classes/main/menu/class_BaseMenu.php
index 1f3512b6..7bb97e16 100644
--- a/inc/classes/main/menu/class_BaseMenu.php
+++ b/inc/classes/main/menu/class_BaseMenu.php
@@ -49,19 +49,19 @@ 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');
-		} catch (FileIoException $e) {
+			$templateInstance->loadMenuTemplate($command . '_menu_entries');
+		} catch (FileNotFoundException $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();
 	}
 }