Naming convention applied to language strings, new API function added:

[mailer.git] / inc / modules / admin / what-send_newsletter.php

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index 22c3685833d5cbc586f4cb32bb3c0ea47b57ca10..e7b2ca81336527f20f6f05b45703e9d77223d429 100644 (file)
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -54,7 +54,7 @@ WHERE
        `status`='CONFIRMED' AND `nl_receive`='Y'
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // Members are available so we can send out the newsletter!
                while ($content = SQL_FETCHARRAY($result)) {
                        // Construct mail...
@@ -80,7 +80,7 @@ ORDER BY
                } // END - while
 
                // Output message
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NL_SEND_DONE'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_NL_SEND_DONE--}');
        } // END - if
 
        // Free memory
@@ -88,6 +88,8 @@ ORDER BY
 } else {
        // Copy data into constants for the template and load it
        $content['datestamp'] = generateDateTime(time(), 3);
+
+       // Extension html_mail installed?
        if (isExtensionActive('html_mail')) {
                // Load template with HTML mode
                loadTemplate('admin_newsletter', false, $content);