CRM-13444: undo CRM-13445 and prevent archived mailing appearing as scheduled

diff --git a/CRM/Admin/Form/Setting/Smtp.php b/CRM/Admin/Form/Setting/Smtp.php
index 3b82e6a315a62225adb3f467421d0c99a9dc0ad7..eccc03dfd49582df608ba6df85b8676bbd163dde 100644 (file)
--- 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 21f59eac3c82c8b9d2c493d4b2c1de25f6c79b66..77d14951be98662e14fa4db569b0dbb9265c076e 100644 (file)
--- 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;