mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 10:04:35 +02:00
Code Issues Releases Wiki Activity

Fix: Emails could be blank under some circumstances.

Browse Source
This commit is contained in:
Cameron
2015-05-21 23:05:27 -07:00
parent de3f80f9ab
commit d4d28ddcb1
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/mail_manager_class.php
View File

@@ -601,7 +601,7 @@ class e107MailManager
AND mt.`mail_status` <= ".MAIL_STATUS_MAX_ACTIVE."
AND mt.`mail_send_date` <= ".time()."
AND (ms.`mail_last_date` >= ".time()." OR ms.`mail_last_date`=0)
ORDER BY ms.`mail_e107_priority` DESC {$count}";
ORDER BY ms.`mail_e107_priority` DESC, mt.mail_target_id ASC {$count}";
// echo $query.'<br />';
$result = $this->db->gen($query);
@@ -704,7 +704,7 @@ class e107MailManager
if (!$this->currentMailBody)
{
if (isset($email['mail_body_templated']))
if (!empty($email['mail_body_templated']))
{
$this->currentMailBody = $email['mail_body_templated'];
}
@@ -712,6 +712,7 @@ class e107MailManager
{
$this->currentMailBody = $email['mail_body'];
}
$this->currentTextBody = $email['mail_body_alt']; // May be null
}