X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=66a45e537db557b1c3bb771a5bb1828b1207d247;hb=6c9f7d411356871244a6a95b9b4742e116e14f57;hp=c0af3b26dc44f8d2d09ddce97b5ac927124c79c2;hpb=81c90916f7a908c77f8844dff5adc6fae3aed422;p=hub.git

diff --git a/index.php b/index.php
index c0af3b26d..66a45e537 100644
--- a/index.php
+++ b/index.php
@@ -34,8 +34,6 @@ final class ApplicationEntryPoint {
 
 	/**
 	 * The instances we want to remove after all is done
-	 *
-	 * @return	void
 	 */
 	private static $instances = array (
 		'cfg',    // The configuration system
@@ -75,7 +73,7 @@ final class ApplicationEntryPoint {
 		} // END - if
 
 		// Get config instance
-		$configInstance = FrameworkConfiguration::getInstance();
+		$configInstance = FrameworkConfiguration::getSelfInstance();
 
 		// Do we have debug installation?
 		if (($configInstance->getConfigEntry('product_install_mode') == 'productive') || ($silentMode === true)) {
@@ -84,14 +82,14 @@ final class ApplicationEntryPoint {
 		} // END - if
 
 		// Get some instances
-		$tpl = FrameworkConfiguration::getInstance()->getConfigEntry('web_template_class');
-		$languageInstance = LanguageSystem::getInstance();
+		$tpl = FrameworkConfiguration::getSelfInstance()->getConfigEntry('web_template_class');
+		$languageInstance = LanguageSystem::getSelfInstance();
 
 		// Initialize template instance here to avoid warnings in IDE
 		$templateInstance = NULL;
 
 		// Get response instance
-		$responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
+		$responseInstance = ApplicationHelper::getSelfInstance()->getResponseInstance();
 
 		// Is the template engine loaded?
 		if ((class_exists($tpl)) && (is_object($languageInstance))) {
@@ -135,7 +133,7 @@ final class ApplicationEntryPoint {
 			// Is the class there?
 			if (class_exists('ApplicationHelper')) {
 				// Get application instance
-				$applicationInstance = ApplicationHelper::getInstance();
+				$applicationInstance = ApplicationHelper::getSelfInstance();
 
 				// Assign application data
 				$templateInstance->assignApplicationData($applicationInstance);
@@ -148,7 +146,7 @@ final class ApplicationEntryPoint {
 				$templateInstance->assignVariable('code', $code);
 				$templateInstance->assignVariable('extra', $extraData);
 				$templateInstance->assignVariable('backtrace', $backtrace);
-				$templateInstance->assignVariable('total_includes', ClassLoader::getInstance()->getTotal());
+				$templateInstance->assignVariable('total_includes', ClassLoader::getSelfInstance()->getTotal());
 				$templateInstance->assignVariable('total_objects', ObjectFactory::getTotal());
 				$templateInstance->assignVariable('title', $languageInstance->getMessage('emergency_exit_title'));