Mailer project rwritten:

[mailer.git] / inc / email-functions.php

diff --git a/inc/email-functions.php b/inc/email-functions.php
index e477edac1b790c209be0958b073173bfb152071e..a793b45e7859eaa437e887fc9269292b85fade2a 100644 (file)
--- a/inc/email-functions.php
+++ b/inc/email-functions.php
@@ -81,7 +81,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
        } // END - if
 
        // Debug mode enabled?
-       if (isDebugModeEnabled()) {
+       if ((isDebugModeEnabled()) && (!isAjaxOutputMode())) {
                // Init content array
                $content = array(
                        'headers' => htmlentities(trim($mailHeader)),
@@ -227,7 +227,7 @@ function sendGenericBuildMails ($mode, $tableName, $content, $id, $subjectPart =
        } // END - if
 
        // Is the raw userid set?
-       if (isValidUserId(postRequestElement($userIdColumn[0], $id))) {
+       if (isValidId(postRequestElement($userIdColumn[0], $id))) {
                // Set it in content
                $content[$userIdColumn[0]] = bigintval(postRequestElement($userIdColumn[0], $id));