Index: branches/unlabeled/unlabeled-1.22.2/core/units/email_events/email_events_event_handler.php =================================================================== diff -u -r5240 -r5362 --- branches/unlabeled/unlabeled-1.22.2/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 5240) +++ branches/unlabeled/unlabeled-1.22.2/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 5362) @@ -154,19 +154,19 @@ $message_object->Load(array('EventId' => $event_id, 'LanguageId' => $this->Application->GetVar('m_lang'))); $message_type = $message_object->GetDBField('MessageType'); + $email_object = &$this->Application->recallObject('kEmailMessage'); + $email_object->Clear(); + // add footer: begin $sql = 'SELECT em.Template FROM '.$message_object->TableName.' em LEFT JOIN '.TABLE_PREFIX.'Events e ON e.EventId = em.EventId WHERE em.LanguageId = '.$message_object->GetDBField('LanguageId').' AND e.Event = "COMMON.FOOTER"'; $footer = explode("\n\n", $this->Conn->GetOne($sql)); - $footer = $message_object->GetDBField('MessageType') == 'text' ? strip_tags($footer[1]) : $footer[1]; + $footer = $message_object->GetDBField('MessageType') == 'text' ? $email_object->convertHTMLtoPlain($footer[1]) : $footer[1]; $message_template = $message_object->GetDBField('Template')."\r\n".$footer; // add footer: end - $email_object = &$this->Application->recallObject('kEmailMessage'); - $email_object->Clear(); - $old_autoload = $this->Application->getUnitOption('u', 'AutoLoad'); $this->Application->setUnitOption('u', 'AutoLoad', false);