Fix for the fix... ;)

diff --git a/inc/databases.php b/inc/databases.php
index 8e4aeb6a37eba3612593a6dc477ac84f46c70e90..b0a7bd961e6eef1b94d9b4787a89a983bbceedc3 100644 (file)
--- 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 2b03a73f11db3ee23eee893ff35f514d59b71bfc..564894e75cec258f90ff442db7e4ba79bc97046e 100644 (file)
--- 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 3b2a13d966335ebdf3783e7bb8e0b99170a20519..35b7e5eba6f3ce7bb76fd40694bff68f8380d9ad 100644 (file)
--- 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']);