From: Roland Häder <roland@mxchange.org>
Date: Fri, 22 Aug 2025 03:35:40 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9e5f0a34e5b3a0bf6a0542c6e531f1a22d66eb22;p=core.git

Continued:
- language sub-system should be singleton
---

diff --git a/framework/main/classes/language/class_LanguageSystem.php b/framework/main/classes/language/class_LanguageSystem.php
index f46e8ed2..a1454b9d 100644
--- a/framework/main/classes/language/class_LanguageSystem.php
+++ b/framework/main/classes/language/class_LanguageSystem.php
@@ -118,9 +118,6 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 		// Set language code from default config
 		$langInstance->setLanguageCode(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('default_lang'));
 
-		// Remember this instance
-		self::$selfInstance = $langInstance;
-
 		// Return the prepared instance
 		return $langInstance;
 	}
@@ -131,6 +128,13 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
 	 * @return	$selfInstance	An instance of this class
 	 */
 	public static final function getSelfInstance (): ManageableLanguage {
+		// Is an instance set?
+		if (!(self::$selfInstance instanceof ManageableLanguage)) {
+			// Init instance with auto-detected path
+			self::$selfInstance = self::createLanguageSystem();
+		}
+
+		//.Return singleton instance
 		return self::$selfInstance;
 	}