Merge pull request #2293 from kurund/notice-fixes

[civicrm-core.git] / CRM / Contact / Form / Inline / CommunicationPreferences.php

diff --git a/CRM/Contact/Form/Inline/CommunicationPreferences.php b/CRM/Contact/Form/Inline/CommunicationPreferences.php
index 9fc3ef70b4668e2abc0f17845e05baa16629ce54..3ce08e9cd35148b2211c606a97c88717b8bfc847 100644 (file)
--- a/CRM/Contact/Form/Inline/CommunicationPreferences.php
+++ b/CRM/Contact/Form/Inline/CommunicationPreferences.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.4                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2013                                |
  +--------------------------------------------------------------------+
@@ -60,7 +60,8 @@ class CRM_Contact_Form_Inline_CommunicationPreferences extends CRM_Contact_Form_
     $defaults = parent::setDefaultValues();
 
     if (!empty($defaults['preferred_language'])) {
-      $defaults['preferred_language'] = CRM_Core_PseudoConstant::getKey('CRM_Contact_DAO_Contact', 'preferred_language', $defaults['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