Continued:

- also update these templates

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/framework/main/classes/output/class_ b/framework/main/classes/output/class_
index f1122d04cd1f2bee9509e71e35f70457248bfadf..1f1588ddfa5c58957f2e1def0fece2b572fe2e70 100644 (file)
--- a/framework/main/classes/output/class_
+++ b/framework/main/classes/output/class_
@@ -57,7 +57,7 @@ class ???Output extends BaseOutput implements OutputStreamer, Registerable {
                        self::$!!!Instance = new WebOutput();
 
                        // Get the content type
                        self::$!!!Instance = new WebOutput();
 
                        // Get the content type

-                       $contentType = self::$!!!Instance->getConfigInstance()->getConfigEntry('!!!_content_type');
+                       $contentType = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('!!!_content_type');

 
                        // Set the content type
                        if (!empty($contentType)) {
 
                        // Set the content type
                        if (!empty($contentType)) {

diff --git a/framework/main/classes/resolver/class_ b/framework/main/classes/resolver/class_
index 6a4ce8cf2036f686a71991b63ec444f1af681ad4..0fd01b9f4bf79d17f2e981e59b634ab0e88a9707 100644 (file)
--- a/framework/main/classes/resolver/class_
+++ b/framework/main/classes/resolver/class_
@@ -84,7 +84,7 @@ class ???Resolver extends BaseResolver implements Resolver {
                $!!!Name = $requestInstance->getRequestElement('action');
 
                // Is the action empty? Then fall back to default action
                $!!!Name = $requestInstance->getRequestElement('action');
 
                // Is the action empty? Then fall back to default action

-               if (empty($!!!Name)) $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
+               if (empty($!!!Name)) $!!!Name = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_action');

 
                // Check if action is valid
                if ($this->is|||Valid($!!!Name) === false) {
 
                // Check if action is valid
                if ($this->is|||Valid($!!!Name) === false) {


@@ -123,7 +123,7 @@ class ???Resolver extends BaseResolver implements Resolver {
 
                // Is the action empty? Then fall back to default action
                if (empty($!!!Name)) {
 
                // Is the action empty? Then fall back to default action
                if (empty($!!!Name)) {

-                       $!!!Name = $this->getConfigInstance()->getConfigEntry('default_action');
+                       $!!!Name = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_action');

                } // END - if
 
                // Check if action is valid
                } // END - if
 
                // Check if action is valid

diff --git a/framework/main/classes/template/class_ b/framework/main/classes/template/class_
index 3590c23ed7c73b14e018c75577d3560a96606de5..4590f17f7f74fb8d1b32703b38d7be54d4780e62 100644 (file)
--- a/framework/main/classes/template/class_
+++ b/framework/main/classes/template/class_
@@ -3,6 +3,7 @@
 namespace CoreFramework\Template\Engine\;
 
 // Import framework stuff
 namespace CoreFramework\Template\Engine\;
 
 // Import framework stuff

+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;

 use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
 
 /**
 use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
 
 /**


@@ -55,7 +56,7 @@ class ???TemplateEngine extends BaseTemplateEngine implements CompileableTemplat
                $templateInstance = new ???TemplateEngine();
 
                // Determine base path
                $templateInstance = new ???TemplateEngine();
 
                // Determine base path

-               $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('application') . DIRECTORY_SEPARATOR;
+               $templateBasePath = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('application') . DIRECTORY_SEPARATOR;

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


@@ -76,11 +77,11 @@ class ???TemplateEngine extends BaseTemplateEngine implements CompileableTemplat
                $templateInstance->setTemplateBasePath($templateBasePath);
 
                // Set template extensions
                $templateInstance->setTemplateBasePath($templateBasePath);
 
                // Set template extensions

-               $templateInstance->setRawTemplateExtension($templateInstance->getConfigInstance()->getConfigEntry('raw_template_extension'));
-               $templateInstance->setCodeTemplateExtension($templateInstance->getConfigInstance()->getConfigEntry('code_template_extension'));
+               $templateInstance->setRawTemplateExtension(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('raw_template_extension'));
+               $templateInstance->setCodeTemplateExtension(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('code_template_extension'));

 
                // Absolute output path for compiled templates
 
                // Absolute output path for compiled templates

-               $templateInstance->setCompileOutputPath($templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $templateInstance->getConfigInstance()->getConfigEntry('compile_output_path'));
+               $templateInstance->setCompileOutputPath(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('application_base_path') . FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('compile_output_path'));

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