More rewrites to make use of (cached) wrapper functions

[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 6db44f6c4373fbbbe794b26a4846e2c4781f7695..2d9eaef8a6849a218017568102a7574902b902ab 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...
@@ -70,21 +70,21 @@ ORDER BY
                        }
 
                        // Compile message
-                       setPostRequestParameter('text', compileCode(postRequestParameter('text')));
+                       setPostRequestParameter('text', preCompileCode(postRequestParameter('text')));
 
                        // Load template
                        $message = loadEmailTemplate($template, array('text' => postRequestParameter('text')), $content['userid']);
 
                        // ... and send it away!
                        sendNewsletter($content['email'], postRequestParameter('subject'), $message, postRequestParameter('mode'));
-               }
-
-               // Free memory
-               SQL_FREERESULT($result);
+               } // 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
+       SQL_FREERESULT($result);
 } else {
        // Copy data into constants for the template and load it
        $content['datestamp'] = generateDateTime(time(), 3);