X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ftemplate%2Fmenu%2Fclass_MenuTemplateEngine.php;h=b8fb5fe6dee560f8d520173da091570cc8f3a929;hp=59d1eeef2492e67db63051978e4aa31ab88e3bed;hb=4b88c118b615335d06bd74e444173d21aef4406c;hpb=84e2207412d3c6ea9f940a83b2cdd4503509808a

diff --git a/inc/classes/main/template/menu/class_MenuTemplateEngine.php b/inc/classes/main/template/menu/class_MenuTemplateEngine.php
index 59d1eeef..b8fb5fe6 100644
--- a/inc/classes/main/template/menu/class_MenuTemplateEngine.php
+++ b/inc/classes/main/template/menu/class_MenuTemplateEngine.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -95,7 +95,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 	 * @throws	BasePathReadProtectedException	If $templateBasePath is
 	 *											read-protected
 	 */
-	public final static function createMenuTemplateEngine (ManageableApplication $appInstance, RenderableMenu $menuInstance) {
+	public static final function createMenuTemplateEngine (ManageableApplication $appInstance, RenderableMenu $menuInstance) {
 		// Get a new instance
 		$templateInstance = new MenuTemplateEngine();
 
@@ -121,9 +121,6 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 			throw new BasePathReadProtectedException(array($templateInstance, $templateBasePath), self::EXCEPTION_READ_PROTECED_PATH);
 		}
 
-		// Get configuration instance
-		$configInstance = FrameworkConfiguration::getInstance();
-
 		// Set the base path
 		$templateInstance->setTemplateBasePath($templateBasePath);
 
@@ -132,11 +129,11 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 		$templateInstance->setFileIoInstance($ioInstance);
 
 		// Set template extensions
-		$templateInstance->setRawTemplateExtension($configInstance->getConfigEntry('raw_template_extension'));
-		$templateInstance->setCodeTemplateExtension($configInstance->getConfigEntry('menu_template_extension'));
+		$templateInstance->setRawTemplateExtension($templateInstance->getConfigInstance()->getConfigEntry('raw_template_extension'));
+		$templateInstance->setCodeTemplateExtension($templateInstance->getConfigInstance()->getConfigEntry('menu_template_extension'));
 
 		// Absolute output path for compiled templates
-		$templateInstance->setCompileOutputPath($configInstance->getConfigEntry('base_path') . $configInstance->getConfigEntry('compile_output_path'));
+		$templateInstance->setCompileOutputPath($templateInstance->getConfigInstance()->getConfigEntry('base_path') . $templateInstance->getConfigInstance()->getConfigEntry('compile_output_path'));
 
 		// Set the menu instance
 		$templateInstance->setMenuInstance($menuInstance);