Several fixes/improvements:

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

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index b4b9ae067fce13a8bfd2380b91d14090732d38af..9bdfb6bb6c230d214855c6165e1cbd1f97784599 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -53,6 +53,7 @@ if (getConfig('autopurge_inactive') == 'Y') {
        initSqls();
 
        // Init exclusion list
+       // @TODO Rewrite these if() blocks to a filter
        $EXCLUDE_LIST = '';
        if (getConfig('def_refid') > 0) {
                $EXCLUDE_LIST = " AND d.userid != ".getConfig('def_refid');
@@ -64,7 +65,7 @@ if (getConfig('autopurge_inactive') == 'Y') {
        if (isExtensionActive('doubler')) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('doubler_userid')."";
 
        // Check for new holiday extension
-       if (getExtensionVersion('holiday') >= '0.1.3') {
+       if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                // Include only users with no active holiday
                $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
        } // END - if