Updated domain without a dash :(

[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 4dd1d9c4c4a00ea5c5092b0879c2f71c0a9a5536..38d7157e029f5a760884c9346459e07c8f6f2787 100644 (file)
--- a/inc/classes/main/menu/class_BaseMenu.php
+++ b/inc/classes/main/menu/class_BaseMenu.php
@@ -2,11 +2,11 @@
 /**
  * A general menu system class
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
  * @copyright  Copyright (c) 2007 - 2009 Roland Haeder, this is free software
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,30 +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(), $this));
+               $templateInstance = ObjectFactory::createObjectByConfiguredName('menu_template_class', array($this));
 
                // Set it for later use
                $this->setTemplateInstance($templateInstance);
 
                // Load the menu template for all
-               $this->getTemplateInstance()->loadMenuTemplate('generic_menu_entries');
+               $templateInstance->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');
+                       $templateInstance->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();
+               $menuContent = $templateInstance->getRawTemplateData();
 
                // Render it here
-               $this->getTemplateInstance()->renderXmlContent($menuContent);
-               //die('!OK');
+               $templateInstance->renderXmlContent($menuContent);
+               //exit(__METHOD__ . ':!OK');
        }
 
        /**