From 6f294e25643d164aed61ab7dcc6fe5b20009fd59 Mon Sep 17 00:00:00 2001
From: Jitendra Purohit <jitendra.purohit@webaccessglobal.com>
Date: Mon, 25 Aug 2014 15:32:13 +0530
Subject: [PATCH] CRM-15160 Fix for communication_style and other options

---
 CRM/Badge/BAO/Badge.php   | 7 +------
 CRM/Contact/BAO/Query.php | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/CRM/Badge/BAO/Badge.php b/CRM/Badge/BAO/Badge.php
index eca1c03461..a86aef7c7f 100644
--- a/CRM/Badge/BAO/Badge.php
+++ b/CRM/Badge/BAO/Badge.php
@@ -475,12 +475,7 @@ class CRM_Badge_BAO_Badge {
     $dao = CRM_Core_DAO::executeQuery($queryString);
     $rows = array();
     while ($dao->fetch()) {
-      if (!empty($dao->country_id)) {
-        $dao->country = CRM_Core_PseudoConstant::country($dao->country_id);
-      }
-      if (!empty($dao->state_province_id)) {
-        $dao->state_province = CRM_Core_PseudoConstant::stateProvince($dao->state_province_id);
-      }
+      $query->convertToPseudoNames($dao);
       $rows[$dao->participant_id] = array();
       foreach ($returnProperties as $key => $dontCare) {
         $rows[$dao->participant_id][$key] = isset($dao->$key) ? $dao->$key : NULL;
diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 5dd767f493..4821f15a15 100644
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -659,7 +659,7 @@ class CRM_Contact_BAO_Query {
         }
       }
 
-      if (in_array($name, array('prefix_id', 'suffix_id', 'gender_id'))) {
+      if (in_array($name, array('prefix_id', 'suffix_id', 'gender_id', 'communication_style_id'))) {
         if (CRM_Utils_Array::value($field['pseudoconstant']['optionGroupName'], $this->_returnProperties)) {
           $makeException = TRUE;
         }
-- 
2.25.1