X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fmenu%2Fclass_BaseMenu.php;h=3e37de7d232e19e6cc59f5997477694b0be4001d;hp=38d7157e029f5a760884c9346459e07c8f6f2787;hb=de2d894308a066a7315746ef5067806b9d99eb2c;hpb=b4683952aea678cf8e45d95989176073961de136

diff --git a/inc/classes/main/menu/class_BaseMenu.php b/inc/classes/main/menu/class_BaseMenu.php
index 38d7157e..3e37de7d 100644
--- a/inc/classes/main/menu/class_BaseMenu.php
+++ b/inc/classes/main/menu/class_BaseMenu.php
@@ -49,33 +49,39 @@ 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($command)) {
+			// Use default page as none has been specified
+			$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) {
-			// @TODO Should we log it here? We should, because it will be silently ignored.
+			// Log exception @TODO Maybe to intrusive?
+			self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: Exception caught: ' . $e->__toString() . ', with message: ' . $e->getMessage());
 		}
 
-		// Get the prepared content
-		$menuContent = $templateInstance->getRawTemplateData();
-
-		// Render it here
-		$templateInstance->renderXmlContent($menuContent);
+		// Render template data here
+		$templateInstance->renderXmlContent();
 		//exit(__METHOD__ . ':!OK');
 	}
 
 	/**
-	 * Transfers the rendered menu to a given templatex engine by assigning
+	 * Transfers the rendered menu to a given template engine by assigning
 	 * the rendered content with a template variable.
 	 *
 	 * @param	$templateInstance	An instance of a CompileableTemplate class
 	 * @return	void
 	 */
 	public function transferContentToTemplateEngine (CompileableTemplate $templateInstance) {
-		$this->partialStub('templateInstance=' . $templateInstance->__toString());
+		// Assign menu content to variable
+		$templateInstance->assignVariable('menu', $this->getTemplateInstance()->getMenuContent());
+		//* DEBUG */ $templateInstance->debugInstance();
 	}
 }