projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #11947 from eileenmcnaughton/dev_tab
[civicrm-core.git]
/
CRM
/
Mailing
/
BAO
/
MailingJob.php
diff --git
a/CRM/Mailing/BAO/MailingJob.php
b/CRM/Mailing/BAO/MailingJob.php
index 9818bacd2f71aff539bf6140bbe15760ac05d442..d86815a7a4a4d3a68adffa2d4005eadd9a6cb2f8 100644
(file)
--- a/
CRM/Mailing/BAO/MailingJob.php
+++ b/
CRM/Mailing/BAO/MailingJob.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 4.7 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
7
|
+ | Copyright CiviCRM LLC (c) 2004-201
8
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
7
+ * @copyright CiviCRM LLC (c) 2004-201
8
*/
require_once 'Mail.php';
*/
require_once 'Mail.php';
@@
-69,10
+69,8
@@
class CRM_Mailing_BAO_MailingJob extends CRM_Mailing_DAO_MailingJob {
$job->scheduled_date = $params['scheduled_date'];
$job->is_test = $params['is_test'];
$job->save();
$job->scheduled_date = $params['scheduled_date'];
$job->is_test = $params['is_test'];
$job->save();
- $mailing = new CRM_Mailing_BAO_Mailing();
- $mailing->id = $params['mailing_id'];
- if ($mailing->id && $mailing->find(TRUE)) {
- $mailing->getRecipients($job->id, $params['mailing_id'], TRUE, $mailing->dedupe_email);
+ if ($params['mailing_id']) {
+ CRM_Mailing_BAO_Mailing::getRecipients($params['mailing_id']);
return $job;
}
else {
return $job;
}
else {
@@
-377,11
+375,11
@@
class CRM_Mailing_BAO_MailingJob extends CRM_Mailing_DAO_MailingJob {
continue;
}
continue;
}
+ $transaction = new CRM_Core_Transaction();
+
$job->split_job($offset);
// update the status of the parent job
$job->split_job($offset);
// update the status of the parent job
- $transaction = new CRM_Core_Transaction();
-
$saveJob = new CRM_Mailing_DAO_MailingJob();
$saveJob->id = $job->id;
$saveJob->start_date = date('YmdHis');
$saveJob = new CRM_Mailing_DAO_MailingJob();
$saveJob->id = $job->id;
$saveJob->start_date = date('YmdHis');
@@
-439,6
+437,7
@@
VALUES (%1, %2, %3, %4, %5, %6, %7)
CRM_Core_DAO::executeQuery($sql, $params);
}
}
CRM_Core_DAO::executeQuery($sql, $params);
}
}
+
}
/**
}
/**