Fixes for SQL error + missing config

[mailer.git] / inc / purge / purge-inact.php

diff --git a/inc/purge/purge-inact.php b/inc/purge/purge-inact.php
index 45b4da7dc6c0313ba025be36fcbcf06268553f22..a137f2ebb6315e07a2e528ee79773e3886aff946 100644 (file)
--- a/inc/purge/purge-inact.php
+++ b/inc/purge/purge-inact.php
@@ -54,7 +54,7 @@ if (isAutopurgeInactiveEnabled()) {
        // Init userid exclusion
        $excludeSql = '';
        $excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
-       if (count($excludedUserids) > 0) {
+       if (isFilledArray($excludedUserids)) {
                // Exclude all
                $excludeSql = ' AND `userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
        } // END - if
@@ -76,7 +76,7 @@ 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
+       (UNIX_TIMESTAMP() - `ap_notified`) >= {?ap_inactive_since?}
        " . runFilterChain('user_exclusion_sql', $excludeSql) . "
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);