Skip to content
Snippets Groups Projects
Commit d63bd141 authored by lobo's avatar lobo
Browse files

CRM-13766 - dont reset scheduled_date, use create function to reset approval fields

----------------------------------------
* CRM-13766: civimail with workflow broken: scheduled date not stored with mailing job
  http://issues.civicrm.org/jira/browse/CRM-13766
parent 53b8f5da
No related branches found
No related tags found
No related merge requests found
......@@ -282,9 +282,9 @@ class CRM_Mailing_Form_Schedule extends CRM_Core_Form {
}
$session = CRM_Core_Session::singleton();
// set the scheduled_id
$params['scheduled_id'] = $session->get('userID');
$params['scheduled_date'] = date('YmdHis');
// set approval details if workflow is not enabled
if (!CRM_Mailing_Info::workflowEnabled()) {
......@@ -294,13 +294,9 @@ class CRM_Mailing_Form_Schedule extends CRM_Core_Form {
}
else {
// reset them in case this mailing was rejected
$mailing = new CRM_Mailing_BAO_Mailing();
$mailing->id = $ids['mailing_id'];
$mailing->find(TRUE);
$mailing->approver_id = 'null';
$mailing->approval_date = 'null';
$mailing->approval_status_id = 'null';
$params['approver_id'] = 'null';
$params['approval_date'] = 'null';
$params['approval_status_id'] = 'null';
}
/* Build the mailing object */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment