X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Floader%2Fclass_ClassLoader.php;fp=framework%2Floader%2Fclass_ClassLoader.php;h=5ae12d7779cb62bf75801b4f6a92598bc6b111f8;hp=63f6d00d280c83ba0fee3277b74321c7a814ab64;hb=24814f48bc7bad92f55e8763bf3f657fb41b131d;hpb=974964e500f24aa7695dc4ec555dc659f78e40e8

diff --git a/framework/loader/class_ClassLoader.php b/framework/loader/class_ClassLoader.php
index 63f6d00d..5ae12d77 100644
--- a/framework/loader/class_ClassLoader.php
+++ b/framework/loader/class_ClassLoader.php
@@ -220,7 +220,7 @@ class ClassLoader {
 		$loaderInstance = self::getSelfInstance();
 
 		// Get config instance
-		$configInstance = FrameworkConfiguration::getSelfInstance();
+		$configInstance = FrameworkBootstrap::getConfigurationInstance();
 
 		// Load all classes
 		foreach (self::$frameworkPaths as $shortPath) {
@@ -269,7 +269,7 @@ class ClassLoader {
 		$loaderInstance = self::getSelfInstance();
 
 		// Get config instance
-		$configInstance = FrameworkConfiguration::getSelfInstance();
+		$configInstance = FrameworkBootstrap::getConfigurationInstance();
 
 		// Load all classes for the application
 		foreach (self::$frameworkPaths as $shortPath) {
@@ -310,7 +310,7 @@ class ClassLoader {
 		//* NOISY-DEBUG: */ printf('[%s:%d]: CALLED!' . PHP_EOL, __METHOD__, __LINE__);
 
 		// Get config instance
-		$configInstance = FrameworkConfiguration::getSelfInstance();
+		$configInstance = FrameworkBootstrap::getConfigurationInstance();
 
 		// Load all classes for the application
 		foreach (self::$testPaths as $shortPath) {
@@ -399,7 +399,7 @@ class ClassLoader {
 		// Is the instance there?
 		if (is_null(self::$selfInstance)) {
 			// Get a new one
-			self::$selfInstance = ClassLoader::createClassLoader(FrameworkConfiguration::getSelfInstance());
+			self::$selfInstance = ClassLoader::createClassLoader(FrameworkBootstrap::getConfigurationInstance());
 		} // END - if
 
 		// Return the instance