Index: branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php =================================================================== diff -u -r16598 -r16599 --- branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php (.../mailing_list_eh.php) (revision 16598) +++ branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php (.../mailing_list_eh.php) (revision 16599) @@ -1,6 +1,6 @@ Array ('self' => 'edit'), 'OnGenerateEmailQueue' => Array ('self' => true), + 'OnProcessEmailQueue' => Array ('self' => true), 'OnGetHtmlBody' => Array ('self' => 'edit'), ); @@ -254,6 +255,25 @@ } /** + * Allows to safely get mailing configuration variables + * + * @param string $variable_name Variable name. + * + * @return integer + * @deprecated 5.2.2-B2 + * @see MailingListHelper::getSetting() + */ + function _ensureDefault($variable_name) + { + kUtil::deprecatedMethod(__METHOD__, '5.2.2-B2', 'MailingListHelper::getSetting'); + + /** @var MailingListHelper $mailing_list_helper */ + $mailing_list_helper = $this->Application->recallObject('MailingListHelper'); + + return $mailing_list_helper->getSetting($variable_name); + } + + /** * Generates email queue for active mailing lists * * @param kEvent $event @@ -332,6 +352,22 @@ } /** + * [SCHEDULED TASK] Process email queue from cron + * + * @param kEvent $event Event. + * + * @return void + * @deprecated 5.2.2-B2 + * @see EmailQueueEventHandler::OnProcess() + */ + function OnProcessEmailQueue($event) + { + kUtil::deprecatedMethod(__METHOD__, '5.2.2-B2', 'EmailQueueEventHandler::OnProcess'); + + $event->CallSubEvent('email-queue:OnProcess'); + } + + /** * Returns HTML of sent e-mail for iframe * * @param kEvent $event