fix formatting and typos

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 8774894af11c24fcc65986f5a4bdeeda1bc43e00..996379dbbe79ea38d45d93b2e0aa2d7b395b9825 100644 (file)
--- 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 08838ae359288b5549abda351cb672967dd87092..704484cedcc570885335613725b5ec565707606a 100644 (file)
--- 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 76da0920c73df2d693426c45f35af833c9bc106b..65d00d942828c701e546d00397d2d6a0c04b6f4b 100644 (file)
--- 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