X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fload_extensions.php;h=dff3faf065ea10ab34d3cec70f0face778c14692;hb=1f2d89e3a6abd36ae030e3bf7ef2e194e5d8f35c;hp=726591df3daee00f7e50895b2007fd29a86fd892;hpb=0fc1ee8cef93bba5a9345dc37e68b5a4603c6d3d;p=mailer.git

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 726591df3d..dff3faf065 100644
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -46,7 +46,7 @@ $GLOBALS['cache_instance'] = null;
 $GLOBALS['cache_array'] = array();
 
 // Skip loading extensions
-if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isInstalling())) {
+if ((!isInstalled()) || (isInstalling())) {
 	// Init filter system here
 	INIT_FILTER_SYSTEM();
 
@@ -223,7 +223,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
 		// Does the extension file exists?
 		if (FILE_READABLE($FQFN)) {
 			// By default no extension is always active, except sql_patches
-			$EXT_ALWAYS_ACTIVE = "N";
+			EXT_SET_ALWAYS_ACTIVE("N");
 
 			// Load extension
 			if (($content['ext_name'] != "sql_patches") && (($content['ext_name'] != "cache") || (!EXT_IS_ACTIVE("cache")))) {
@@ -231,11 +231,11 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
 				LOAD_EXTENSION($content['ext_name']);
 			} else {
 				// Keep sql_patches always active
-				$EXT_ALWAYS_ACTIVE = "Y";
+				EXT_SET_ALWAYS_ACTIVE("Y");
 			}
 
 			// Transfer EXT_ALWAYS_ACTIVE flag
-			$content['ext_keep'] = $EXT_ALWAYS_ACTIVE;
+			$content['ext_keep'] = EXT_GET_ALWAYS_ACTIVE();
 
 			// CSS file handling:
 			if ((!isset($content['ext_css'])) || ($content['ext_css'] == "Y")) {
@@ -259,7 +259,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
 				$GLOBALS['cache_instance']->addRow($content);
 			} elseif ($GLOBALS['cacheMode'] == "no") {
 				// Remember this value for later usage
-				$GLOBALS['cache_array']['active_extensions'][$content['ext_name']] = $EXT_ALWAYS_ACTIVE;
+				$GLOBALS['cache_array']['active_extensions'][$content['ext_name']] = EXT_GET_ALWAYS_ACTIVE();
 			}
 		} elseif (!FILE_READABLE($FQFN)) {
 			// Deleted extension file so we mark it for removal from DB
@@ -286,7 +286,7 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($GLOBALS['cacheMode'] == "init") && ($
 }
 
 // Run the filter
-RUN_FILTER('load_includes', $INC_POOL);
+runFilterChain('load_includes', $INC_POOL);
 
 // Uninstall extensions that are no longer in our system
 if (!empty($DEL[0])) {