Continued:

[core.git] / framework / main / classes / response / class_BaseResponse.php

diff --git a/framework/main/classes/response/class_BaseResponse.php b/framework/main/classes/response/class_BaseResponse.php
index 625c1d95b38f30600c984452bedb7bb86d8a5a1a..cb5d984944b2d951cf0eedb0f355d4e457feeaaf 100644 (file)
--- a/framework/main/classes/response/class_BaseResponse.php
+++ b/framework/main/classes/response/class_BaseResponse.php
@@ -3,6 +3,7 @@
 namespace Org\Mxchange\CoreFramework\Response;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 
@@ -11,7 +12,7 @@ use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -155,7 +156,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
                $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
                // Adds the resolved message id to the fatal message list
-               $this->addFatalMessagePlain($applicationInstance()->getLanguageInstance()->getMessage($messageId));
+               $this->addFatalMessagePlain($applicationInstance->getLanguageInstance()->getMessage($messageId));
        }
 
        /**
@@ -200,7 +201,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
                        $this->addHeader('Pragma', 'no-cache'); // HTTP/1.0
 
                        // Define the charset to be used
-                       //$this->addHeader('Content-type:', sprintf("text/html; charset=%s", $this->getConfigInstance()->getConfigEntry('header_charset')));
+                       //$this->addHeader('Content-type:', sprintf("text/html; charset=%s", FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('header_charset')));
 
                        // Send all headers
                        foreach ($this->responseHeaders as $name => $value) {
@@ -225,7 +226,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
                        $this->getWebOutputInstance()->output($this->responseBody);
                } else {
                        // Display all error messages
-                       $applicationInstance()->handleFatalMessages($this->getGenericArrayKey('fatal_messages', 'generic', 'message'));
+                       $applicationInstance->handleFatalMessages($this->getGenericArrayKey('fatal_messages', 'generic', 'message'));
 
                        // Send the error messages out to the world
                        $this->getWebOutputInstance()->output($this->responseBody);
@@ -252,7 +253,7 @@ abstract class BaseResponse extends BaseFrameworkSystem {
                );
 
                // Get default command response
-               $defaultCommand = $this->getConfigInstance()->getConfigEntry($configKey);
+               $defaultCommand = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configKey);
 
                // Return it
                return $defaultCommand;