Continued with rewrites:

[core.git] / framework / main / classes / template / html / class_HtmlTemplateEngine.php

diff --git a/framework/main/classes/template/html/class_HtmlTemplateEngine.php b/framework/main/classes/template/html/class_HtmlTemplateEngine.php
index 1149effff9de6e8add6800558b7f664cf078b050..763d88c2f3f6b4aa744fd0f91e93d44129d58b00 100644 (file)
--- a/framework/main/classes/template/html/class_HtmlTemplateEngine.php
+++ b/framework/main/classes/template/html/class_HtmlTemplateEngine.php
@@ -62,7 +62,7 @@ class HtmlTemplateEngine extends BaseTemplateEngine implements CompileableTempla
                $applicationInstance = Registry::getRegistry()->getInstance('app');
 
                // Determine base path
                $applicationInstance = Registry::getRegistry()->getInstance('app');
 
                // Determine base path

-               $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('app') . '/';
+               $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getAppShortName(). '/';

 
                // Is the base path valid?
                if (empty($templateBasePath)) {
 
                // Is the base path valid?
                if (empty($templateBasePath)) {


@@ -87,7 +87,10 @@ class HtmlTemplateEngine extends BaseTemplateEngine implements CompileableTempla
                $templateInstance->setCodeTemplateExtension($templateInstance->getConfigInstance()->getConfigEntry('code_template_extension'));
 
                // Absolute output path for compiled templates
                $templateInstance->setCodeTemplateExtension($templateInstance->getConfigInstance()->getConfigEntry('code_template_extension'));
 
                // Absolute output path for compiled templates

-               $templateInstance->setCompileOutputPath($templateInstance->getConfigInstance()->getConfigEntry('base_path') . $templateInstance->getConfigInstance()->getConfigEntry('compile_output_path'));
+               $templateInstance->setCompileOutputPath(sprintf('%s%s/',
+                       $templateBasePath,
+                       $templateInstance->getConfigInstance()->getConfigEntry('compile_output_path')
+               ));

 
                // Return the prepared instance
                return $templateInstance;
 
                // Return the prepared instance
                return $templateInstance;