Index: trunk/admin/email/do_send.php
===================================================================
diff -u -r6093 -r7867
--- trunk/admin/email/do_send.php (.../do_send.php) (revision 6093)
+++ trunk/admin/email/do_send.php (.../do_send.php) (revision 7867)
@@ -69,15 +69,16 @@
$footer_body =& $footer[$is_html ? 'html' : 'plain'];
if (is_null($footer_body)) {
$application =& kApplication::Instance();
- $email_object =& $application->recallObject('kEmailMessage');
- $email_object->Clear();
+
+ $esender =& $application->recallObject('EmailSender');
+ /* @var $esender kEmailSendingHelper */
$sql = 'SELECT em.Template
FROM '.TABLE_PREFIX.'EmailMessage em
LEFT JOIN '.TABLE_PREFIX.'Events e ON e.EventId = em.EventId
WHERE em.LanguageId = '.$application->GetVar('m_lang').' AND e.Event = "COMMON.FOOTER"';
$footer_body = explode("\n\n", $application->Conn->GetOne($sql));
- $footer_body = "\r\n".($is_html ? '
'.$footer_body[1] : $email_object->convertHTMLtoPlain($footer_body[1]));
+ $footer_body = "\r\n".($is_html ? '
'.$footer_body[1] : $esender->ConvertToText($footer_body[1]));
}
return $footer_body;
}