Revision: 2146
http://mrbs.svn.sourceforge.net/mrbs/?rev=2146&view=rev
Author: tbleher
Date: 2011-10-24 21:14:44 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
Correctly encode subject in delete notification mails
Modified Paths:
--------------
mrbs/trunk/web/functions_mail.inc
Modified: mrbs/trunk/web/functions_mail.inc
===================================================================
--- mrbs/trunk/web/functions_mail.inc 2011-10-24 10:22:23 UTC (rev 2145)
+++ mrbs/trunk/web/functions_mail.inc 2011-10-24 21:14:44 UTC (rev 2146)
@@ -973,12 +973,6 @@
$attachment['name'] = $mail_settings['ics_filename'] . ".ics";
}
- // If the subject contains any non-ASCII characters...
- if (!preg_match('/^[[:ascii:]]*$/', $subject))
- {
- // ...communicate the charset and encode it correctly
- $subject = "=?".get_mail_charset()."?B?".base64_encode($subject)."?=";
- }
$result = sendMail($addresses,
$subject,
$text_body,
@@ -1180,6 +1174,12 @@
}
(!empty($addresses['cc'])) ? $headers['Cc'] = $addresses['cc'] : '';
(!empty($addresses['bcc'])) ? $headers['Bcc'] = $addresses['bcc'] : '';
+ // If the subject contains any non-ASCII characters...
+ if (!preg_match('/^[[:ascii:]]*$/', $subject))
+ {
+ // ...communicate the charset and encode it correctly
+ $subject = "=?".get_mail_charset()."?B?".base64_encode($subject)."?=";
+ }
$headers['Subject'] = $subject;
$headers['Mime-Version'] = '1.0';
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
