From 01aca36266e045f533dfc4bc1788a659ceaa3072 Mon Sep 17 00:00:00 2001 From: "Donald A. Lobo" Date: Wed, 10 Apr 2013 10:04:56 -0700 Subject: [PATCH] fix formatting and typos --- CRM/Activity/BAO/Activity.php | 6 ++++-- CRM/Mailing/BAO/Job.php | 1 - CRM/Utils/System/WordPress.php | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index 8774894af1..996379dbbe 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -1519,11 +1519,13 @@ LEFT JOIN civicrm_case_activity ON ( civicrm_case_activity.activity_id = tbl.a $phoneTypes = CRM_Core_OptionGroup::values('phone_type', TRUE, FALSE, FALSE, NULL, 'name'); if ($values['phone_type_id'] == CRM_Utils_Array::value('Mobile', $phoneTypes)) { $smsParams['To'] = $values['phone']; - } else{ + } + else { $smsParams['To'] = ''; } - if (self::sendSMSMessage($contactId, + if (self::sendSMSMessage( + $contactId, $tokenText, $tokenHtml, $smsParams, diff --git a/CRM/Mailing/BAO/Job.php b/CRM/Mailing/BAO/Job.php index 08838ae359..704484cedc 100644 --- a/CRM/Mailing/BAO/Job.php +++ b/CRM/Mailing/BAO/Job.php @@ -874,7 +874,6 @@ AND status IN ( 'Scheduled', 'Running', 'Paused' ) 'source_contact_id' => $mailing->scheduled_id, // CRM-9519 'target_contact_id' => array_unique($targetParams), - 'target_contact_id' => $targetParams, 'activity_type_id' => $activityTypeID, 'source_record_id' => $this->mailing_id, 'activity_date_time' => $job_date, diff --git a/CRM/Utils/System/WordPress.php b/CRM/Utils/System/WordPress.php index 76da0920c7..65d00d9428 100644 --- a/CRM/Utils/System/WordPress.php +++ b/CRM/Utils/System/WordPress.php @@ -277,7 +277,7 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { $script = get_permalink($post->ID); } - // when shortcode is inlcuded in page + // when shortcode is included in page // also make sure we have valid query object global $wp_query; if ( method_exists( $wp_query, 'get' ) ) { @@ -310,7 +310,7 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { } if (isset($path)) { - if (isset($query)) { + if (isset($query)) { if ($permlinkStructure != '' && ($pageID || $script != '')) { return $script . '?page=CiviCRM&q=' . $path . $pageID . $separator . $query . $fragment; } @@ -328,7 +328,7 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { } } else { - if (isset($query)) { + if (isset($query)) { if ($permlinkStructure != '' && ($pageID || $script != '')) { return $script . '?' . $query . $pageID . $fragment; } @@ -337,10 +337,10 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base { } } else { - return $base . $fragment; - } + return $base . $fragment; } } + } /** * Authenticate the user against the wordpress db -- 2.25.1