Rewrote many parts:

[mailer.git] / inc / monthly / monthly_beg.php

diff --git a/inc/monthly/monthly_beg.php b/inc/monthly/monthly_beg.php
index 79f50ac9fc93f826358e4b3935debbc4c820c73f..16cb2762d7d4e43c30d3d42af793ba3febd6349c 100644 (file)
--- a/inc/monthly/monthly_beg.php
+++ b/inc/monthly/monthly_beg.php
@@ -67,12 +67,6 @@ if ((getBegRanks() > 0) && (!isCssOutputMode())) {
                $whereStatement .= ' AND (UNIX_TIMESTAMP() - `d`.`last_online`) < {?ap_inactive_since?}';
        } // END - if
 
-       // Is ext-holiday installed?
-       if (isExtensionActive('holiday')) {
-               // Exclude those as well
-               $whereStatement .= " AND `d`.`holiday_active`='N'";
-       } // END - if
-
        // SQL string to check for accounts
        $result_main = sqlQuery("SELECT
        `d`.`userid`,
@@ -81,8 +75,7 @@ FROM
        `{?_MYSQL_PREFIX?}_user_data` AS `d`
 WHERE
        `d`.`status`='CONFIRMED'
-       " . $whereStatement . "
-       " . runFilterChain('user_exclusion_sql', ' ') . " AND
+       " . runFilterChain('user_exclusion_sql', $whereStatement) . " AND
        `d`.`beg_points` > 0
 ORDER BY
        `d`.`beg_points` DESC,