From cbe30f5a809e44e7b3a58f4363b7b8d20f2bd6a1 Mon Sep 17 00:00:00 2001 From: yashodha Date: Wed, 28 Aug 2013 19:18:24 +0530 Subject: [PATCH] rename Job DAO to MailingJob --- CRM/Mailing/BAO/MailingJob.php | 8 ++++---- CRM/Report/Form/Mailing/Summary.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CRM/Mailing/BAO/MailingJob.php b/CRM/Mailing/BAO/MailingJob.php index c2588e015d..d9919f106f 100644 --- a/CRM/Mailing/BAO/MailingJob.php +++ b/CRM/Mailing/BAO/MailingJob.php @@ -125,7 +125,7 @@ class CRM_Mailing_BAO_MailingJob extends CRM_Mailing_DAO_MailingJob { // other emails, this job might have changed under us // lets get the job status again and check $job->status = CRM_Core_DAO::getFieldValue( - 'CRM_Mailing_DAO_Job', + 'CRM_Mailing_DAO_MailingJob', $job->id, 'status', 'id', @@ -328,7 +328,7 @@ class CRM_Mailing_BAO_MailingJob extends CRM_Mailing_DAO_MailingJob { // changed between the first query and now // to avoid race conditions $job->status = CRM_Core_DAO::getFieldValue( - 'CRM_Mailing_DAO_Job', + 'CRM_Mailing_DAO_MailingJob', $job->id, 'status', 'id', @@ -382,7 +382,7 @@ VALUES (%1, %2, %3, %4, %5, %6, %7) ); // create one child job if the mailing size is less than the offset - // probably use a CRM_Mailing_DAO_Job( ); + // probably use a CRM_Mailing_DAO_MailingJob( ); if (empty($offset) || $recipient_count <= $offset ) { @@ -722,7 +722,7 @@ VALUES (%1, %2, %3, %4, %5, %6, %7) // to avoid making too many DB calls for this rare case // lets do it when we snapshot $status = CRM_Core_DAO::getFieldValue( - 'CRM_Mailing_DAO_Job', + 'CRM_Mailing_DAO_MailingJob', $this->id, 'status', 'id', diff --git a/CRM/Report/Form/Mailing/Summary.php b/CRM/Report/Form/Mailing/Summary.php index f0daf1c165..1cb11262b5 100644 --- a/CRM/Report/Form/Mailing/Summary.php +++ b/CRM/Report/Form/Mailing/Summary.php @@ -89,7 +89,7 @@ class CRM_Report_Form_Mailing_Summary extends CRM_Report_Form { ); $this->_columns['civicrm_mailing_job'] = array( - 'dao' => 'CRM_Mailing_DAO_Job', + 'dao' => 'CRM_Mailing_DAO_MailingJob', 'fields' => array( 'start_date' => array( 'title' => ts('Start Date'), -- 2.25.1