From: Roland Häder Date: Tue, 30 Sep 2008 20:51:11 +0000 (+0000) Subject: Fix for the fix... ;) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=660bf694d3714cb69ac67e7a62b345f93c8a119e;p=mailer.git Fix for the fix... ;) --- diff --git a/inc/databases.php b/inc/databases.php index 8e4aeb6a37..b0a7bd961e 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -113,7 +113,7 @@ define('USAGE_BASE', "usage"); define('SERVER_URL', "http://www.mxchange.org"); // This current patch level -define('CURR_SVN_REVISION', "426"); +define('CURR_SVN_REVISION', "427"); // Take a prime number which is long (if you know a longer one please try it out!) define('_PRIME', 591623); diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php index 2b03a73f11..564894e75c 100644 --- a/inc/libs/newsletter_functions.php +++ b/inc/libs/newsletter_functions.php @@ -167,17 +167,17 @@ function SEND_NEWSLETTER($TO, $SUBJECT, $MSG, $MODE) // Automatically insert URLs into newsletter if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) { // Send HTML mail - SEND_EMAIL($TO, $SUBJECT, HTML_INSERT_URLS($MSG), "Y"); + SEND_EMAIL($TO, $SUBJECT, array('text' => HTML_INSERT_URLS($MSG)), "Y"); } else { // Send normal mail - SEND_EMAIL($TO, $SUBJECT, NL_INSERT_URLS($MSG), "N"); + SEND_EMAIL($TO, $SUBJECT, array('text' => NL_INSERT_URLS($MSG)), "N"); } } else { // Regular send-out if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) { - SEND_EMAIL($TO, $SUBJECT, $MSG, "Y"); + SEND_EMAIL($TO, $SUBJECT, array('text' => $MSG), "Y"); } else { - SEND_EMAIL($TO, $SUBJECT, $MSG, "N"); + SEND_EMAIL($TO, $SUBJECT, array('text' => $MSG), "N"); } } } diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php index 3b2a13d966..35b7e5eba6 100644 --- a/inc/modules/admin/what-send_newsletter.php +++ b/inc/modules/admin/what-send_newsletter.php @@ -67,7 +67,7 @@ if (isset($_POST['ok'])) $_POST['text'] = COMPILE_CODE($_POST['text']); // Load template - $msg = LOAD_EMAIL_TEMPLATE($template, array('text' => $_POST['text']), $id); + $msg = LOAD_EMAIL_TEMPLATE($template, $_POST['text'], $id); // ... and send it away! SEND_NEWSLETTER($email, $_POST['subject'], $msg, $_POST['mode']);