Changeset 25360 for trunk/admin/notification_by_mail.php

Timestamp:

Nov 6, 2013, 6:57:53 PM (10 years ago)

Author:

mistic100

Message:

feature 2995: New email template
restore get_l10n_args removed at r25357
apply changes to NBM

File:

• trunk/admin/notification_by_mail.php (modified) (2 diffs)

trunk/admin/notification_by_mail.php

@@ -306 +306 @@
             if ($exist_data)
             {
-              $subject = '['.$conf['gallery_title'].']: '.l10n('New photos added');
+              $subject = '['.$conf['gallery_title'].'] '.l10n('New photos added');
 
               // Assign current var for nbm mail
@@ -378 +378 @@
                 )
               );
-
-              if (pwg_mail
-                  (
-                    format_email(stripslashes($nbm_user['username']), $nbm_user['mail_address']),
-                    array
-                    (
-                      'from' => $env_nbm['send_as_mail_formated'],
-                      'subject' => $subject,
-                      'email_format' => $env_nbm['email_format'],
-                      'content' => $env_nbm['mail_template']->parse('notification_by_mail', true),
-                      'content_format' => $env_nbm['email_format'],
-                      'theme' => $nbm_user['theme']
-                    )
-                  ))
+              
+              $ret = pwg_mail(
+                array(
+                  'name' => stripslashes($nbm_user['username']),
+                  'email' => $nbm_user['mail_address'],
+                  ),
+                array(
+                  'from' => $env_nbm['send_as_mail_formated'],
+                  'subject' => $subject,
+                  'email_format' => $env_nbm['email_format'],
+                  'content' => $env_nbm['mail_template']->parse('notification_by_mail', true),
+                  'content_format' => $env_nbm['email_format'],
+                  )
+                );
+
+              if ($ret)
               {
                 inc_mail_sent_success($nbm_user);