A lot calls saved, expression language rewritten:

[mailer.git] / inc / libs / task_functions.php

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index dfdd7f2a88c2b064a91b8e4af67485fac13d2ec7..09c7788bae890a4ae04d4fe3e01a05ea7fc33540 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -336,7 +336,7 @@ ORDER BY
 
                // Autopurge installed?
                $lastOnline = '';
 
                // Autopurge installed?
                $lastOnline = '';

-               if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getConfig('ap_inactive_since') > 0)) {
+               if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getApInactiveSince() > 0)) {

                        // Use last online timestamp to keep inactive members away from here
                        $lastOnline   = ' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})';
                } // END - if
                        // Use last online timestamp to keep inactive members away from here
                        $lastOnline   = ' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})';
                } // END - if


@@ -360,7 +360,7 @@ ORDER BY
 
                // Autopurge installed?
                $lastOnline = '';
 
                // Autopurge installed?
                $lastOnline = '';

-               if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getConfig('ap_inactive_since') > 0)) {
+               if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getApInactiveSince() > 0)) {

                        // Use last online timestamp to keep inactive members away from here
                        $lastOnline   = ' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})';
                } // END - if
                        // Use last online timestamp to keep inactive members away from here
                        $lastOnline   = ' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})';
                } // END - if