X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fload_extensions.php;h=a1544e6c3c0a31408c4b4f84402165ff6be13cf5;hb=89c00e43d2ce1dd1afe11c2c8485307342805f97;hp=8a8c883826a223c309a3025244237003fb15229e;hpb=f9a9c09e1ae257449bfd98f8854e321efba1dc3c;p=mailer.git

diff --git a/inc/load_extensions.php b/inc/load_extensions.php
index 8a8c883826..a1544e6c3c 100644
--- a/inc/load_extensions.php
+++ b/inc/load_extensions.php
@@ -154,14 +154,17 @@ if ($cacheMode == "load") {
 	// No database load needed
 	$res_ext_crt = false;
 
-	// Load more cache files (like admins)
-	require_once(PATH."inc/load_cache.php");
-
 	// Load all extension files
 	foreach ($EXT_POOL as $ext) {
 		LOAD_EXTENSION($ext);
 	} // END - foreach
 
+	// Init filter system
+	INIT_FILTER_SYSTEM();
+
+	// Load more cache files (like admins)
+	require_once(PATH."inc/load_cache.php");
+
 	// Remove array
 	unset($EXT_POOL);
 } else {
@@ -201,7 +204,6 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 
 		// Load extensions
 		$file1 = sprintf("%sinc/extensions/ext-%s.php", PATH, $content['ext_name']);
-		$EXT_CSS = "N"; $EXT_ALWAYS_ACTIVE = "N";
 
 		// Does the extension file exists?
 		if (FILE_READABLE($file1)) {
@@ -250,6 +252,9 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 		}
 	} // END - while
 
+	// Init filter system
+	INIT_FILTER_SYSTEM();
+
 	if ($cacheMode == "init") {
 		// Close cache file
 		$cacheInstance->finalize();
@@ -262,15 +267,8 @@ if ((SQL_NUMROWS($res_ext_crt) > 0) && ((($cacheMode == "init") && ($CSS != "1")
 	SQL_FREERESULT($res_ext_crt);
 } // END - if
 
-// Load include files if found
-if (!empty($INC_POOL[0])) {
-	foreach ($INC_POOL as $inc) {
-		require_once($inc);
-	} // END - foreach
-
-	// Remove array
-	unset($INC_POOL);
-} // END - if
+// Run the filter
+RUN_FILTER('load_includes', $INC_POOL);
 
 // Uninstall extensions that are no longer in our system
 if (!empty($DEL[0])) {
@@ -281,7 +279,7 @@ if (!empty($DEL[0])) {
 			array($del_ext), __FILE__, __LINE__);
 
 		// Remove (maybe?) found tasks (main task and possible updates
-		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE subject LIKE '[%s:]%%' AND (task_type='EXTENSION' OR task_type='EXTENSION_UPDATE')",
+		SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE subject='[%s:]' AND (task_type='EXTENSION' OR task_type='EXTENSION_UPDATE')",
 			array($del_ext), __FILE__, __LINE__);
 	} // END - foreach