From 41a03191f7d14fb3b490c5f5336232b02c20cb35 Mon Sep 17 00:00:00 2001 From: kurund Date: Mon, 6 Jan 2014 11:39:04 -0800 Subject: [PATCH] strict warning fixes --- CRM/Contact/Form/Edit/CommunicationPreferences.php | 5 ++--- CRM/Contact/Form/Inline/CommunicationPreferences.php | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CRM/Contact/Form/Edit/CommunicationPreferences.php b/CRM/Contact/Form/Edit/CommunicationPreferences.php index 207fb2d9d5..a57f66d3fe 100644 --- a/CRM/Contact/Form/Edit/CommunicationPreferences.php +++ b/CRM/Contact/Form/Edit/CommunicationPreferences.php @@ -162,9 +162,8 @@ class CRM_Contact_Form_Edit_CommunicationPreferences { static function setDefaultValues(&$form, &$defaults) { if (!empty($defaults['preferred_language'])) { - $defaults['preferred_language'] = CRM_Utils_Array::key($defaults['preferred_language'], - CRM_Contact_BAO_Contact::buildOptions('preferred_language') - ); + $languages = CRM_Contact_BAO_Contact::buildOptions('preferred_language'); + $defaults['preferred_language'] = CRM_Utils_Array::key($defaults['preferred_language'], $languages); } // CRM-7119: set preferred_language to default if unset diff --git a/CRM/Contact/Form/Inline/CommunicationPreferences.php b/CRM/Contact/Form/Inline/CommunicationPreferences.php index 6c1804b4dc..3ce08e9cd3 100644 --- a/CRM/Contact/Form/Inline/CommunicationPreferences.php +++ b/CRM/Contact/Form/Inline/CommunicationPreferences.php @@ -60,9 +60,8 @@ class CRM_Contact_Form_Inline_CommunicationPreferences extends CRM_Contact_Form_ $defaults = parent::setDefaultValues(); if (!empty($defaults['preferred_language'])) { - $defaults['preferred_language'] = CRM_Utils_Array::key($defaults['preferred_language'], - CRM_Contact_BAO_Contact::buildOptions('preferred_language') - ); + $languages = CRM_Contact_BAO_Contact::buildOptions('preferred_language'); + $defaults['preferred_language'] = CRM_Utils_Array::key($defaults['preferred_language'], $languages); } // CRM-7119: set preferred_language to default if unset -- 2.25.1