X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMailing%2FForm%2FApprove.php;h=1cd4140b037a38eda4af09fe6d96abf055f5a75b;hb=41d9d3cf16473f590b572f4c9851e180b4b0ff0c;hp=ff5c6ddfe26b4fc55a00d2baeb24f623b07f6acc;hpb=f229b2f508162e364f484cfcef40efd2ccfe1c4c;p=civicrm-core.git diff --git a/CRM/Mailing/Form/Approve.php b/CRM/Mailing/Form/Approve.php index ff5c6ddfe2..1cd4140b03 100644 --- a/CRM/Mailing/Form/Approve.php +++ b/CRM/Mailing/Form/Approve.php @@ -129,15 +129,14 @@ class CRM_Mailing_Form_Approve extends CRM_Core_Form { // get the submitted form values. $params = $this->controller->exportValues($this->_name); - $ids = []; if (isset($this->_mailingID)) { - $ids['mailing_id'] = $this->_mailingID; + $params['id'] = $this->_mailingID; } else { - $ids['mailing_id'] = $this->get('mailing_id'); + $params['id'] = $this->get('mailing_id'); } - if (!$ids['mailing_id']) { + if (!$params['id']) { CRM_Core_Error::statusBounce(ts('No mailing id has been able to be determined')); } @@ -154,14 +153,14 @@ class CRM_Mailing_Form_Approve extends CRM_Core_Form { // also delete any jobs associated with this mailing $job = new CRM_Mailing_BAO_MailingJob(); - $job->mailing_id = $ids['mailing_id']; + $job->mailing_id = $params['id']; while ($job->fetch()) { CRM_Mailing_BAO_MailingJob::del($job->id); } } else { $mailing = new CRM_Mailing_BAO_Mailing(); - $mailing->id = $ids['mailing_id']; + $mailing->id = $params['id']; $mailing->find(TRUE); $params['scheduled_date'] = CRM_Utils_Date::processDate($mailing->scheduled_date);