From: Tim Otten Date: Wed, 29 Oct 2014 01:15:07 +0000 (-0700) Subject: CiviMail - Remove debug codes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6ce36da734624a834198cda1c6ea0c832ce4326e;p=civicrm-core.git CiviMail - Remove debug codes --- diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index 7785ec4284..09cfd0e076 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -1475,7 +1475,6 @@ ORDER BY civicrm_email.is_bulkmail DESC static function add(&$params, $ids = array()) { $id = CRM_Utils_Array::value('mailing_id', $ids, CRM_Utils_Array::value('id', $params)); - if ($id) { CRM_Utils_Hook::pre('edit', 'Mailing', $id, $params); } @@ -1658,8 +1657,7 @@ ORDER BY civicrm_email.is_bulkmail DESC // Populate the recipients. $mailing->getRecipients($job->id, $mailing->id, NULL, NULL, TRUE, FALSE); } - //print_r($params); - //exit; + return $mailing; } diff --git a/CRM/Mailing/Event/BAO/Opened.php b/CRM/Mailing/Event/BAO/Opened.php index f39d7f79b1..afa49507b6 100755 --- a/CRM/Mailing/Event/BAO/Opened.php +++ b/CRM/Mailing/Event/BAO/Opened.php @@ -226,9 +226,6 @@ class CRM_Mailing_Event_BAO_Opened extends CRM_Mailing_Event_DAO_Opened { public static function &getRows($mailing_id, $job_id = NULL, $is_distinct = FALSE, $offset = NULL, $rowCount = NULL, $sort = NULL, $contact_id= NULL ) { - CRM_Core_Error::debug_var('3',$offset); - CRM_Core_Error::debug_var('4',$rowCount); - $dao = new CRM_Core_Dao(); $open = self::getTableName(); @@ -272,10 +269,7 @@ class CRM_Mailing_Event_BAO_Opened extends CRM_Mailing_Event_DAO_Opened { $orderBy = "sort_name ASC, {$open}.time_stamp DESC"; if ($sort) { if (is_string($sort)) { - $sort = CRM_Utils_Type::escape($sort, 'String'); - CRM_Core_Error::debug_var('2',$sort); - $orderBy = $sort; } else { @@ -289,7 +283,6 @@ class CRM_Mailing_Event_BAO_Opened extends CRM_Mailing_Event_DAO_Opened { //Added "||$rowCount" to avoid displaying all records on first page $query .= ' LIMIT ' . CRM_Utils_Type::escape($offset, 'Integer') . ', ' . CRM_Utils_Type::escape($rowCount, 'Integer'); } - CRM_Core_Error::debug_var('1',$query); $dao->query($query); $results = array();