X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilter-functions.php;h=e5421fd4ba4954d2aadb2dd2861b6850cb17090c;hb=e3f273938e4e3b8045853ab4bd746d01fa8ade04;hp=9030f97ad393615785f358ff92760d512e6fe773;hpb=93dc3d5b067c15568b01bcda1550018b38d1cdd9;p=mailer.git

diff --git a/inc/filter-functions.php b/inc/filter-functions.php
index 9030f97ad3..e5421fd4ba 100644
--- a/inc/filter-functions.php
+++ b/inc/filter-functions.php
@@ -63,15 +63,15 @@ function initFilterSystem () {
 		if (isExtensionINstalledAndNewer('sql_patches', '0.6.0')) $add = ", `filter_counter`";
 
 		// Load all filters
-		$result = SQL_QUERY("SELECT
-	`filter_name`,`filter_function`,`filter_active`".$add."
+		$result = SQL_QUERY('SELECT
+	`filter_name`,`filter_function`,`filter_active`' . $add . '
 FROM
 	`{?_MYSQL_PREFIX?}_filters`
 ORDER BY
-	`filter_id` ASC", __FUNCTION__, __LINE__);
+	`filter_id` ASC', __FUNCTION__, __LINE__);
 
 		// Are there entries?
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Load all filters
 			while ($filterArray = SQL_FETCHARRAY($result)) {
 				// Get filter name and function
@@ -104,6 +104,7 @@ ORDER BY
 	registerFilter('init', 'INIT_RANDOMIZER');
 	registerFilter('init', 'LOAD_RUNTIME_INCLUDES');
 	registerFilter('init', 'INIT_EXTENSIONS');
+	registerFilter('init', 'SET_CURRENT_DATE');
 	registerFilter('init', 'INIT_RANDOM_NUMBER');
 	registerFilter('init', 'CHECK_SVN_REVISION');
 	registerFilter('init', 'RUN_DAILY_RESET');
@@ -221,8 +222,8 @@ function registerFilter ($filterName, $filterFunction, $silentAbort = true, $for
 }
 
 // "Unregisters" a filter from the given chain
-function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_run = false) {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',dry=' . intval($dry_run) . ' - ENTERED!');
+function unregisterFilter ($F, $L, $filterName, $filterFunction, $force = false, $dry_run = false) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',dry=' . intval($dry_run) . ' - ENTERED!');
 
 	// Extend the filter function name only if not loaded from database
 	if (!isset($GLOBALS['cache_array']['filter']['loaded'][$filterName][$filterFunction])) {
@@ -239,11 +240,11 @@ function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_ru
 	// Shall we remove? (default, not while just showing an extension removal)
 	if ($dry_run === false) {
 		// Mark for filter removal
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'REMOVE: filterName=' . $filterName . ',filterFunction=' . $filterFunction);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'REMOVE: F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction);
 		$GLOBALS['cache_array']['filter']['chains'][$filterName][$filterFunction] = 'R';
 	} // END - if
 
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',dry=' . intval($dry_run) . ' - EXIT!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',dry=' . intval($dry_run) . ' - EXIT!');
 }
 
 // "Runs" the given filters, data is optional and can be any type of data
@@ -275,7 +276,7 @@ function runFilterChain ($filterName, $data = null) {
 			// Is this filter there?
 			if (!function_exists($filterFunction)) {
 				// Unregister it
-				unregisterFilter($filterName, $filterFunction);
+				unregisterFilter(__FUNCTION__, __LINE__, $filterName, $filterFunction);
 
 				// Skip this entry
 				continue;