From f9d3b37647e835b30cce98860e350285694a4109 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 12 Dec 2021 09:08:23 +0100 Subject: [PATCH] Continued: - renamed $tpl to $templateClassName (very old code here) as it is part of the framework - updated 'core' framework MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- core | 2 +- index.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core b/core index 7ffdc10be..b580ca852 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 7ffdc10bef06624ca2c6cf58e1109f880bbbf13e +Subproject commit b580ca852dc945d23290a6f7fb2c77e7c52e0d4b diff --git a/index.php b/index.php index 46f5db5e3..c5ee29a3c 100644 --- a/index.php +++ b/index.php @@ -8,6 +8,7 @@ use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Filesystem\FileNotFoundException; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Localization\LanguageSystem; +use Org\Mxchange\CoreFramework\Localization\ManageableLanguage; use Org\Mxchange\CoreFramework\Loader\ClassLoader; use Org\Mxchange\CoreFramework\Generic\FrameworkException; @@ -83,7 +84,7 @@ final class ApplicationEntryPoint { } // Get some instances - $tpl = $configInstance->getConfigEntry('html_template_class'); + $templateClassName = $configInstance->getConfigEntry('html_template_class'); $languageInstance = LanguageSystem::getSelfInstance(); // Initialize template instance here to avoid warnings in IDE @@ -93,11 +94,11 @@ final class ApplicationEntryPoint { $responseInstance = FrameworkBootstrap::getResponseInstance(); // Is the template engine loaded? - if ((class_exists($tpl)) && (is_object($languageInstance))) { + if ((class_exists($templateClassName)) && ($languageInstance instanceof ManageableLanguage)) { // Use the template engine for putting out (nicer look) the message try { // Get the template instance from our object factory - $templateInstance = ObjectFactory::createObjectByName($tpl); + $templateInstance = ObjectFactory::createObjectByName($templateClassName); } catch (FrameworkException $e) { exit(sprintf('[Main:] Could not initialize template engine for reason: %s', $e->getMessage() -- 2.39.5