X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_autopurge.php;h=861acbd4972126d8d95e81acc1da48be4f71847b;hp=d35b1b4d9fc1bab289c67e62a83b60a0990d6756;hb=d44a7739c860ef0f30e29167b0fea0d2141ebce6;hpb=e5dffd4249c97200cbad02f3f4eaf5c373fdb89a

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index d35b1b4d9f..861acbd497 100644
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -44,18 +44,13 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Exclude default referral id if set
-$userExclusionSql = ' ';
+$userExcludeSql = ' ';
 $excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
 if (isFilledArray($excludedUserids)) {
 	// Exclude all
 	$userExcludeSql = ' AND `d`.`userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
 } // END - if
 
-// @TODO Rewrite this as a filter
-if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
-	$userExclusionSql .= " AND `d`.`holiday_active`='N'";
-} // END - if
-
 // Check for all accounts
 $result = sqlQuery("SELECT
 	`d`.`userid`,
@@ -73,7 +68,7 @@ WHERE
 	(UNIX_TIMESTAMP() - `d`.`joined`) >= {?ap_inactive_since?} AND
 	(UNIX_TIMESTAMP() - `d`.`last_online`) >= {?ap_inactive_since?} AND
 	(UNIX_TIMESTAMP() - `d`.`ap_notified`) >= {?ap_inactive_since?}
-	" . runFilterChain('user_exclusion_sql', $userExcludeSql) . "
+	" . runFilterChain('user_exclusion_sql', ' ' . $userExcludeSql) . "
 ORDER BY
 	`d`.`userid` ASC", __FILE__, __LINE__);