Index: branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php =================================================================== diff -u -N -r14244 -r14596 --- branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php (.../mailing_list_eh.php) (revision 14244) +++ branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php (.../mailing_list_eh.php) (revision 14596) @@ -1,6 +1,6 @@ Name == 'OnMassDelete' && $type == 'before') { $ids = $event->getEventParam('ids'); @@ -135,24 +138,26 @@ * Checks, that at least one message text field is filled * * @param kEvent $event + * @return void + * @access protected */ - function OnBeforeItemCreate(&$event) + protected function OnBeforeItemCreate(&$event) { parent::OnBeforeItemCreate($event); $object =& $event->getObject(); /* @var $object kDBItem */ - if (!$this->Application->GetVar('mailing_recipient_type')) { + if ( !$this->Application->GetVar('mailing_recipient_type') ) { // user manually typed email addresses -> normalize $recipients = str_replace(',', ';', $object->GetDBField('To')); $recipients = array_map('trim', explode(';', $recipients)); $object->SetDBField('To', implode(';', $recipients)); } - if (!$object->GetDBField('MessageText')) { - $object->setRequired('MessageHtml', true); + if ( !$object->GetDBField('MessageText') ) { + $object->setRequired('MessageHtml'); } // remember user, who created mailing, because of his name