X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fmenu%2Fclass_BaseMenu.php;h=32a57c06e94c1a98497a47f30d569e3e0c209a43;hb=768cc231b262ebeaa5aec373d9b7d97cc6b6ac95;hp=aedf6c2873c53cb4d8441be4b22026c4c58eb6f7;hpb=36e4d0eb331bd724db0bd23071271d5eaeb37b17;p=core.git

diff --git a/inc/classes/main/menu/class_BaseMenu.php b/inc/classes/main/menu/class_BaseMenu.php
index aedf6c28..32a57c06 100644
--- a/inc/classes/main/menu/class_BaseMenu.php
+++ b/inc/classes/main/menu/class_BaseMenu.php
@@ -41,20 +41,30 @@ class BaseMenu extends BaseFrameworkSystem {
 	 */
 	public function renderMenu () {
 		// Initialize the menu system by preparing it's template instance
-		$templateInstance = ObjectFactory::createObjectByConfiguredName('menu_template_class', array($this->getApplicationInstance()));
+		$templateInstance = ObjectFactory::createObjectByConfiguredName('menu_template_class', array($this));
 
 		// Set it for later use
 		$this->setTemplateInstance($templateInstance);
 
-		// Load the base (XML) template for generating menus
-		$this->getTemplateInstance()->loadMenuTemplate('base_menu');
+		// Load the menu template for all
+		$this->getTemplateInstance()->loadMenuTemplate('generic_menu_entries');
+
+		// Get the 'page' from request instance
+		$page = $this->getApplicationInstance()->getRequestInstance()->getRequestElement('page');
+
+		// Load the menu template for this page
+		try {
+			$this->getTemplateInstance()->loadMenuTemplate($page . '_menu_entries');
+		} catch (FileIoException $e) {
+			// @TODO Should we log it here? We should, because it will be silently ignored.
+		}
 
 		// Get the prepared content
 		$menuContent = $this->getTemplateInstance()->getRawTemplateData();
 
 		// Render it here
 		$this->getTemplateInstance()->renderXmlContent($menuContent);
-		die('!OK');
+		//die('!OK');
 	}
 
 	/**