Merge pull request #32566 from alifrumin/maillogandsend

#5824 Misleading System Status message when CIVICRM_MAIL_LOG_AND_SEND is set

Merge pull request #32566 from alifrumin/maillogandsend
1958cd0f · Seamus Lee · GitHub · 26b55159 · 4c46459b · 1958cd0f
Unverified Commit 1958cd0f authored 2 weeks ago by Seamus Lee Committed by GitHub 2 weeks ago
--- a/CRM/Utils/Check/Component/Env.php
+++ b/CRM/Utils/Check/Component/Env.php
@@ -150,7 +150,7 @@ class CRM_Utils_Check_Component_Env extends CRM_Utils_Check_Component {

    $mailingInfo = Civi::settings()->get('mailing_backend');
    if (($mailingInfo['outBound_option'] == CRM_Mailing_Config::OUTBOUND_OPTION_REDIRECT_TO_DB
-      || (defined('CIVICRM_MAIL_LOG') && CIVICRM_MAIL_LOG)
+      || (defined('CIVICRM_MAIL_LOG') && CIVICRM_MAIL_LOG && !defined('CIVICRM_MAIL_LOG_AND_SEND'))
      || $mailingInfo['outBound_option'] == CRM_Mailing_Config::OUTBOUND_OPTION_DISABLED
      || $mailingInfo['outBound_option'] == CRM_Mailing_Config::OUTBOUND_OPTION_MOCK)
    ) {