From fadd4d3794d02aa088774aa37254bfda67207f65 Mon Sep 17 00:00:00 2001 From: Samuel Vanhove Date: Tue, 28 Apr 2015 19:58:02 -0400 Subject: [PATCH] CRM-16355 - checkstyle typos --- CRM/Admin/Form/ScheduleReminders.php | 6 +++--- CRM/Core/BAO/ActionSchedule.php | 7 +++---- CRM/Core/I18n.php | 1 - 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CRM/Admin/Form/ScheduleReminders.php b/CRM/Admin/Form/ScheduleReminders.php index 0bc20b4d4a..e6156387b8 100644 --- a/CRM/Admin/Form/ScheduleReminders.php +++ b/CRM/Admin/Form/ScheduleReminders.php @@ -394,7 +394,7 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form { $defaults['recipient_manual_id'] = $defaults['recipient_manual']; } if ($contactLanguage = CRM_Utils_Array::value('filter_contact_language', $defaults)) { - $defaults['filter_contact_language'] = explode(CRM_Core_DAO::VALUE_SEPARATOR, $contactLanguage); + $defaults['filter_contact_language'] = explode(CRM_Core_DAO::VALUE_SEPARATOR, $contactLanguage); } } @@ -519,9 +519,9 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form { } // multilingual options - $params['filter_contact_language'] = CRM_Utils_Array::value('filter_contact_language', $values, null); + $params['filter_contact_language'] = CRM_Utils_Array::value('filter_contact_language', $values, NULL); $params['filter_contact_language'] = implode(CRM_Core_DAO::VALUE_SEPARATOR, $params['filter_contact_language']); - $params['communication_language'] = CRM_Utils_Array::value('communication_language', $values, null); + $params['communication_language'] = CRM_Utils_Array::value('communication_language', $values, NULL); if ($this->_action & CRM_Core_Action::UPDATE) { $params['id'] = $this->_id; diff --git a/CRM/Core/BAO/ActionSchedule.php b/CRM/Core/BAO/ActionSchedule.php index 7be01b2959..0f321e3f9f 100755 --- a/CRM/Core/BAO/ActionSchedule.php +++ b/CRM/Core/BAO/ActionSchedule.php @@ -814,7 +814,6 @@ LEFT JOIN civicrm_phone phone ON phone.id = lb.phone_id } $entityJoinClause .= $extraOn; - $query = " SELECT reminder.id as reminderID, reminder.contact_id as contactID, reminder.entity_table as entityTable, reminder.*, e.id as entityID, e.* {$extraSelect} FROM civicrm_action_log reminder @@ -1241,7 +1240,7 @@ reminder.action_schedule_id = %1"; if ($table != 'civicrm_contact e') { $join[] = "INNER JOIN civicrm_contact c ON c.id = {$contactField} AND c.is_deleted = 0 AND c.is_deceased = 0 "; - } + } $multilingual = CRM_Core_I18n::isMultilingual(); if ($multilingual && !empty($actionSchedule->filter_contact_language)) { @@ -1250,7 +1249,7 @@ reminder.action_schedule_id = %1"; // get language filter for the schedule $filter_contact_language = explode(CRM_Core_DAO::VALUE_SEPARATOR, $actionSchedule->filter_contact_language); $w = ''; - if (($key = array_search(CRM_Core_I18n::NONE, $filter_contact_language)) !== false) { + if (($key = array_search(CRM_Core_I18n::NONE, $filter_contact_language)) !== FALSE) { $w .= "{$tableAlias}.preferred_language IS NULL OR {$tableAlias}.preferred_language = '' OR "; unset($filter_contact_language[$key]); } @@ -1565,7 +1564,7 @@ WHERE m.owner_membership_id IS NOT NULL AND public static function setCommunicationLanguage($communication_language, $preferred_language) { $config = CRM_Core_Config::singleton(); $language = $config->lcMessages; - + // prepare the language for the email if ($communication_language == CRM_Core_I18n::AUTO) { if (!empty($preferred_language)) { diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php index 20c0b4a065..016ee6e16b 100644 --- a/CRM/Core/I18n.php +++ b/CRM/Core/I18n.php @@ -550,7 +550,6 @@ class CRM_Core_I18n { * True if the domain was changed for an extension. */ public function setLanguage($language) { - $config = CRM_Core_Config::singleton(); if ($this->_nativegettext) { -- 2.25.1