Fixes for unset config entries and ['header'] entry

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

diff --git a/inc/autopurge/purge-inact.php b/inc/autopurge/purge-inact.php
index 652a561e2eeb25704279fcc201844dd6b4618c5c..b4b9ae067fce13a8bfd2380b91d14090732d38af 100644 (file)
--- a/inc/autopurge/purge-inact.php
+++ b/inc/autopurge/purge-inact.php
@@ -94,7 +94,7 @@ ORDER BY
                $content['time']  = (getConfig('ap_inactive_time')  / 60 / 60);
 
                // Mark found accounts as inactive and send an email
-               while ($content = SQL_FETCHARRAY($result_inactive)) {
+               while ($content = merge_array($content, SQL_FETCHARRAY($result_inactive))) {
                        // Remember userids for the admin
                        $useridsContent .= $content['userid'].", ";
 
@@ -114,7 +114,7 @@ ORDER BY
                $useridsContent = str_replace(', ', "\n", substr($useridsContent, 0, -2));
 
                // Send mail notification to admin
-               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), 'admin_autopurge_inactive', $useridsContent, '');
+               sendAdminNotification(getMessage('AUTOPURGE_ADMIN_INACTIVE_SUBJECT'), 'admin_autopurge_inactive', $useridsContent);
        } // END - if
 
        // Free memory
@@ -154,7 +154,7 @@ ORDER BY `userid` ASC",
 
                // Send mail notification to admin
                if (getConfig('ap_in_notify') == 'Y') {
-                       sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), 'admin_autopurge_delete', $useridsContent, '');
+                       sendAdminNotification(getMessage('AUTOPURGE_ADMIN_DELETE_SUBJECT'), 'admin_autopurge_delete', $useridsContent);
                } // END - if
        } // END - if