rename Job DAO to MailingJob

diff --git a/CRM/Mailing/BAO/MailingJob.php b/CRM/Mailing/BAO/MailingJob.php
index c2588e015dffb5a70e252a1155ad0e7619d6665b..d9919f106f440649513c8a0995d34e9eba346606 100644 (file)
--- 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 f0daf1c1652af0eca5d4da40f20d39e63e2a9ad2..1cb11262b5daccfc9c0a033bc9db6fcbffd31c7c 100644 (file)
--- 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'),