die() expanded with __METHOD__

[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 8041813b3f5151eb955eed43db010f55c585a044..c41bdcb786e02b589ae780f018a20c74bf290f54 100644 (file)
--- a/inc/classes/main/menu/class_BaseMenu.php
+++ b/inc/classes/main/menu/class_BaseMenu.php
@@ -41,7 +41,7 @@ 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);
@@ -55,7 +55,7 @@ class BaseMenu extends BaseFrameworkSystem {
                // Load the menu template for this page
                try {
                        $this->getTemplateInstance()->loadMenuTemplate($page . '_menu_entries');
-               } catch (FileNotFoundException $e) {
+               } catch (FileIoException $e) {
                        // @TODO Should we log it here? We should, because it will be silently ignored.
                }
 
@@ -64,7 +64,7 @@ class BaseMenu extends BaseFrameworkSystem {
 
                // Render it here
                $this->getTemplateInstance()->renderXmlContent($menuContent);
-               die('!OK');
+               //die(__METHOD__ . ':!OK');
        }
 
        /**