X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload-config.php;h=f5be7054bad24bb51f257bc28c1394c38566eb61;hb=15e0995f7a4a4b2c9b1b1a9273f785cf13605829;hp=1acb1e24651778f3494eaf3c889e55c968df1bb0;hpb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;p=mailer.git

diff --git a/inc/loader/load-config.php b/inc/loader/load-config.php
index 1acb1e2465..f5be7054ba 100644
--- a/inc/loader/load-config.php
+++ b/inc/loader/load-config.php
@@ -38,8 +38,9 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-} elseif (isInstallationPhase()) {
+} elseif (isInstaller()) {
 	// Do not run in installation phase
+	//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Run from installation phase.');
 	return FALSE;
 }
 
@@ -58,21 +59,21 @@ if (($GLOBALS['cache_instance']->loadCacheFile('config')) && ($GLOBALS['cache_in
 
 	// Remove dummy array
 	unset($config);
-} elseif ((isHtmlOutputMode()) || (isRawOutputMode())) {
+} elseif ((isHtmlOutputMode()) || (isAjaxOutputMode()) || (isRawOutputMode())) {
 	// Create cache file here
 	$GLOBALS['cache_instance']->init();
 
 	// Query for all config entries
-	$result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_config` ORDER BY `config` ASC', __FILE__, __LINE__);
+	$result = sqlQuery('SELECT * FROM `{?_MYSQL_PREFIX?}_config` ORDER BY `config` ASC', __FILE__, __LINE__);
 
 	// .. and load them
-	while ($content = SQL_FETCHARRAY($result)) {
+	while ($content = sqlFetchArray($result)) {
 		// Add row to cache file
 		$GLOBALS['cache_instance']->addRow($content);
 	} // END - while
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Close the cache
 	$GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');