X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fclass_BaseFrameworkSystem.php;h=e1f0d55fb45eef10e1124b9789d621785dbf9473;hp=c3bb447f2bf4f1128259572e845f114645c5a5cf;hb=fbd656cb3ca44cd60893ad06983c43d908ad1e29;hpb=df2e651915deb67dc47b37943afb31298d185dc9

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index c3bb447f..e1f0d55f 100644
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -1509,7 +1509,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	}
 
 	/**
-	 * Prepare the template engine (WebTemplateEngine by default) for a given
+	 * Prepare the template engine (HtmlTemplateEngine by default) for a given
 	 * application helper instance (ApplicationHelper by default).
 	 *
 	 * @param		$applicationInstance	An application helper instance or
@@ -1532,7 +1532,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		} // END - if
 
 		// Initialize the template engine
-		$templateInstance = ObjectFactory::createObjectByConfiguredName('web_template_class');
+		$templateInstance = ObjectFactory::createObjectByConfiguredName('html_template_class');
 
 		// Return the prepared instance
 		return $templateInstance;
@@ -1670,7 +1670,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			// Try it
 			try {
 				// Get a debugger instance
-				$debugInstance = DebugMiddleware::createDebugMiddleware(FrameworkConfiguration::getSelfInstance()->getConfigEntry('debug_class'));
+				$debugInstance = DebugMiddleware::createDebugMiddleware(FrameworkConfiguration::getSelfInstance()->getConfigEntry('debug_' . $this->getResponseTypeFromSystem() . '_class'));
 			} catch (NullPointerException $e) {
 				// Didn't work, no instance there
 				exit('Cannot create debugInstance! Exception=' . $e->__toString() . ', message=' . $e->getMessage());
@@ -2229,8 +2229,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 
 		// Is 'HTTP_HOST' set?
 		if (isset($_SERVER['HTTP_HOST'])) {
-			// Then it is a HTTP response/request
-			$responseType = 'http';
+			/*
+			 * Then it is a HTML response/request as RSS and so on may be
+			 * transfered over HTTP as well.
+			 */
+			$responseType = 'html';
 		} // END - if
 
 		// Return it