Merge branch 'master' into findById

[civicrm-core.git] / CRM / Mailing / Event / BAO / Delivered.php

diff --git a/CRM/Mailing/Event/BAO/Delivered.php b/CRM/Mailing/Event/BAO/Delivered.php
index 35bfd3a88189d413803db4e81c4d4fea0caea524..f695a94844718e75e54fa03dcdb4016eb5092436 100644 (file)
--- a/CRM/Mailing/Event/BAO/Delivered.php
+++ b/CRM/Mailing/Event/BAO/Delivered.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,14 +28,14 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
 class CRM_Mailing_Event_BAO_Delivered extends CRM_Mailing_Event_DAO_Delivered {
 
   /**
-   * class constructor
+   * Class constructor
    */
   function __construct() {
     parent::__construct();
@@ -99,7 +99,7 @@ class CRM_Mailing_Event_BAO_Delivered extends CRM_Mailing_Event_DAO_Delivered {
     $bounce    = CRM_Mailing_Event_BAO_Bounce::getTableName();
     $queue     = CRM_Mailing_Event_BAO_Queue::getTableName();
     $mailing   = CRM_Mailing_BAO_Mailing::getTableName();
-    $job       = CRM_Mailing_BAO_Job::getTableName();
+    $job       = CRM_Mailing_BAO_MailingJob::getTableName();
 
     $query = "
             SELECT      COUNT($delivered.id) as delivered
@@ -158,7 +158,7 @@ class CRM_Mailing_Event_BAO_Delivered extends CRM_Mailing_Event_DAO_Delivered {
     $bounce    = CRM_Mailing_Event_BAO_Bounce::getTableName();
     $queue     = CRM_Mailing_Event_BAO_Queue::getTableName();
     $mailing   = CRM_Mailing_BAO_Mailing::getTableName();
-    $job       = CRM_Mailing_BAO_Job::getTableName();
+    $job       = CRM_Mailing_BAO_MailingJob::getTableName();
     $contact   = CRM_Contact_BAO_Contact::getTableName();
     $email     = CRM_Core_BAO_Email::getTableName();
 
@@ -227,6 +227,10 @@ class CRM_Mailing_Event_BAO_Delivered extends CRM_Mailing_Event_DAO_Delivered {
     return $results;
   }
 
+  /**
+   * @param $eventQueueIDs
+   * @param null $time
+   */
   static function bulkCreate($eventQueueIDs, $time = NULL) {
     if (!$time) {
       $time = date('YmdHis');