From 3509acc2599a67101b078129441c8125f93dfa1e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 4 Jul 2018 00:44:35 +0200 Subject: [PATCH] Continued: - opps, to less unit tests to find this ... :-( MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- framework/main/classes/response/class_BaseResponse.php | 4 ++-- framework/main/classes/response/html/class_HtmlResponse.php | 2 +- framework/main/classes/response/image/class_ImageResponse.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/main/classes/response/class_BaseResponse.php b/framework/main/classes/response/class_BaseResponse.php index 625c1d95..b2e137de 100644 --- a/framework/main/classes/response/class_BaseResponse.php +++ b/framework/main/classes/response/class_BaseResponse.php @@ -155,7 +155,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)); } /** @@ -225,7 +225,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); diff --git a/framework/main/classes/response/html/class_HtmlResponse.php b/framework/main/classes/response/html/class_HtmlResponse.php index 03815a9e..f0eb0bbb 100644 --- a/framework/main/classes/response/html/class_HtmlResponse.php +++ b/framework/main/classes/response/html/class_HtmlResponse.php @@ -140,7 +140,7 @@ class HtmlResponse extends BaseResponse implements Responseable { } // END - if // Assign application data - $this->getTemplateInstance()->assignApplicationData($applicationInstance()); + $this->getTemplateInstance()->assignApplicationData($applicationInstance); // Get the url from config $url = $this->getConfigInstance()->getConfigEntry($configEntry . '_url'); diff --git a/framework/main/classes/response/image/class_ImageResponse.php b/framework/main/classes/response/image/class_ImageResponse.php index a2fc7a06..2ff80036 100644 --- a/framework/main/classes/response/image/class_ImageResponse.php +++ b/framework/main/classes/response/image/class_ImageResponse.php @@ -150,7 +150,7 @@ class ImageResponse extends BaseResponse implements Responseable { } // END - if // Assign application data - $this->getTemplateInstance()->assignApplicationData($applicationInstance()); + $this->getTemplateInstance()->assignApplicationData($applicationInstance); // Get the url from config $url = $this->getConfigInstance()->getConfigEntry($configEntry . '_url'); -- 2.39.2