From 2a7b216675beb5e487b3041693e871d5a2717a2c Mon Sep 17 00:00:00 2001 From: DemeritCowboy Date: Wed, 2 Oct 2013 12:30:06 -0400 Subject: [PATCH] CRM-13444: undo CRM-13445 and prevent archived mailing appearing as scheduled --- CRM/Admin/Form/Setting/Smtp.php | 3 +-- CRM/Mailing/BAO/Spool.php | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CRM/Admin/Form/Setting/Smtp.php b/CRM/Admin/Form/Setting/Smtp.php index 3b82e6a315..eccc03dfd4 100644 --- a/CRM/Admin/Form/Setting/Smtp.php +++ b/CRM/Admin/Form/Setting/Smtp.php @@ -53,8 +53,7 @@ class CRM_Admin_Form_Setting_Smtp extends CRM_Admin_Form_Setting { CRM_Mailing_Config::OUTBOUND_OPTION_SMTP => ts('SMTP'), CRM_Mailing_Config::OUTBOUND_OPTION_SENDMAIL => ts('Sendmail'), CRM_Mailing_Config::OUTBOUND_OPTION_DISABLED => ts('Disable Outbound Email'), - // CRM-13445 Suppressing the Redirect to DB option pending further evaluation - // CRM_Mailing_Config::OUTBOUND_OPTION_REDIRECT_TO_DB => ts('Redirect to Database'), + CRM_Mailing_Config::OUTBOUND_OPTION_REDIRECT_TO_DB => ts('Redirect to Database'), ); $this->addRadio('outBound_option', ts('Select Mailer'), $outBoundOption); diff --git a/CRM/Mailing/BAO/Spool.php b/CRM/Mailing/BAO/Spool.php index 21f59eac3c..77d14951be 100644 --- a/CRM/Mailing/BAO/Spool.php +++ b/CRM/Mailing/BAO/Spool.php @@ -76,9 +76,6 @@ class CRM_Mailing_BAO_Spool extends CRM_Mailing_DAO_Spool { $params['created_date'] = date('YmdHis'); $params['scheduled_id'] = $params['created_id']; $params['scheduled_date'] = $params['created_date']; - $params['approver_id'] = $params['created_id']; - $params['approval_date'] = $params['created_date']; - $params['approval_status_id'] = CRM_Core_OptionGroup::getValue('mail_approval_status', 'Approved', 'name'); $params['is_completed'] = 1; $params['is_archived'] = 1; $params['body_html'] = htmlspecialchars( $headerStr ) . "\n\n" . $body; -- 2.25.1