Skip to content
Snippets Groups Projects

[TASK] Ignore mail queue for email configmation messages only

Merged Paul Ilea requested to merge task_ignoreMailQueueForEmailConfimationMessages into master
2 files
+ 9
5
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -272,7 +272,7 @@ class FrontendUserService implements SingletonInterface {
$markers['confirmUrl'] = $confirmUrl;
$markers['confirmEmail'] = $userEmail;
$this->generalService->sendMail(
$markers, $this->settings['fromAddress'], $userEmail, 'confirm_user'
$markers, $this->settings['fromAddress'], $userEmail, 'confirm_user', 'sg_account', TRUE
);
unset($markers['confirmUrl'], $markers['confirmEmail']);
} elseif ($userNotification && $userEmail) {
@@ -291,7 +291,7 @@ class FrontendUserService implements SingletonInterface {
$email->setHash($hash);
$email->setHashDate($GLOBALS['EXEC_TIME']);
$this->generalService->sendMail(
$markers, $this->settings['fromAddress'], $userEmail, 'confirm_email'
$markers, $this->settings['fromAddress'], $userEmail, 'confirm_email', 'sg_account', TRUE
);
}
}
@@ -687,7 +687,7 @@ class FrontendUserService implements SingletonInterface {
$object->setHashDate($GLOBALS['EXEC_TIME']);
$markers['confirmEmail'] = $object->getEmail();
$this->generalService->sendMail(
$markers, $this->settings['fromAddress'], $object->getEmail(), 'confirm_email'
$markers, $this->settings['fromAddress'], $object->getEmail(), 'confirm_email', 'sg_account', TRUE
);
if ($saveObject) {
switch ($data['record_table']) {
Loading