More complete rewrite to use wrapper function isExtensionInstalledAndNewer(), some...

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

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index c6c61aafd10cacce9df151b4b7f768d17c67ebb2..ed919e1267f09e60d2dc90baa317955e97baf1cb 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -246,7 +246,7 @@ function outputAdvancedOverview (&$result_main) {
                if (isExtensionActive('beg'))                  $EXCLUDE_LIST .= " AND d.userid != ".getConfig('beg_userid')."";
                if (isExtensionActive('bonus'))                $EXCLUDE_LIST .= " AND d.userid != ".getConfig('bonus_userid')."";
                if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= " AND d.userid != ".getConfig('doubler_userid')."";
-               if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) {
+               if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                        // Recent ext-holiday found
                        $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
                } // END - if
@@ -323,7 +323,7 @@ ORDER BY
 
        if (isExtensionInstalledAndNewer('bonus', '0.2.3')) {
                // Active rallye
-               if (getExtensionVersion('bonus') >= '0.6.9') {
+               if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
                        // Add more bonus points here
                        $USE = '(0';
                        if (getConfig('bonus_click_yn') == 'Y') $USE .= ' + `turbo_bonus`';
@@ -358,7 +358,7 @@ ORDER BY
                $TITLEs[] = getMessage('ADMIN_TASK_LIST_BONUS_TITLE');
        }
 
-       if ((isExtensionActive('beg')) && (getExtensionVersion('beg') >= '0.1.2')) {
+       if (isExtensionInstalledAndNewer('beg', '0.1.2')) {
                // Begging rallye
 
                // Autopurge installed?