X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fpurge%2Fpurge-inact.php;h=b92e90cb5f3c12673b2eda92689d2c11785c4004;hb=1ba8d9449de1b6fea32e88d581fb7c121b0522b1;hp=ad663cc4f0f591e92f313caddf13eaf3539e3c61;hpb=e5dffd4249c97200cbad02f3f4eaf5c373fdb89a;p=mailer.git

diff --git a/inc/purge/purge-inact.php b/inc/purge/purge-inact.php
index ad663cc4f0..b92e90cb5f 100644
--- a/inc/purge/purge-inact.php
+++ b/inc/purge/purge-inact.php
@@ -59,12 +59,6 @@ if (isAutopurgeInactiveEnabled()) {
 		$excludeSql = ' AND `userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
 	} // END - if
 
-	// Check for new holiday extension
-	if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
-		// Include only users with no active holiday
-		$excludeSql .= " AND `holiday_active`='N'";
-	} // END - if
-
 	// Check for all accounts
 	$result_inactive = sqlQuery("SELECT
 	`userid`,
@@ -76,8 +70,8 @@ WHERE
 	`status`='CONFIRMED' AND
 	(UNIX_TIMESTAMP() - `joined`) >= {?ap_inactive_since?} AND
 	(UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?} AND
-	(UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_since?} AND
-	" . runFilterChain('user_exclusion_sql', $excludeSql) . "
+	(UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_since?}
+	" . runFilterChain('user_exclusion_sql', ' ' . $excludeSql) . "
 ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
 
@@ -130,7 +124,7 @@ FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
 	`status`='CONFIRMED'
-	" . runFilterChain('user_exclusion_sql', $excludeSql) . " AND
+	" . runFilterChain('user_exclusion_sql', ' ' . $excludeSql) . " AND
 	(UNIX_TIMESTAMP() - `joined`) >= {?ap_inactive_since?} AND
 	(UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?} AND
 	(UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_time?} AND