From 4e09f9c9aedb0b7b11bf681f02b159d28b3cbaee Mon Sep 17 00:00:00 2001
From: kurund <kurund@civicrm.org>
Date: Wed, 21 Aug 2013 18:17:43 +0530
Subject: [PATCH] CRM-13161, more cleanup/fixes for advanced search - search
view
----------------------------------------
* CRM-13161: Greetings are not evaluated correctly if it includes prefix / suffix
http://issues.civicrm.org/jira/browse/CRM-13161
---
CRM/Contact/Selector.php | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/CRM/Contact/Selector.php b/CRM/Contact/Selector.php
index 7f95c369c0..c8776ef9f1 100644
--- a/CRM/Contact/Selector.php
+++ b/CRM/Contact/Selector.php
@@ -589,19 +589,6 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
$groupID = CRM_Utils_Array::key('1', $this->_formValues['group']);
$pseudoconstants = array();
- if (!empty($this->_fields)) {
- // get all the pseudoconstant values
- foreach ($this->_fields as $name => $values) {
- if (isset($this->_fields[$name]['pseudoconstant'])) {
- $pseudoconstants[$name] =
- array(
- 'dbName' => $this->_fields[$name]['name'],
- 'values' => CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', $name),
- );
- }
- }
- }
-
// for CRM-3157 purposes
if (in_array('world_region', $names)) {
$pseudoconstants['world_region'] = array(
@@ -639,13 +626,6 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
CRM_Core_OptionGroup::lookupValues($paramsNew, $name, FALSE);
$row[$key] = $paramsNew[$key];
}
- elseif ($property == 'gender_id') {
- $row['gender'] = $result->gender;
- }
- elseif ($property == 'prefix_id' || $property == 'suffix_id') {
- $newProperty = 'individual_' . substr($property, 0, -3);
- $row[$newProperty] = $result->$newProperty;
- }
elseif (strpos($property, '-im')) {
$row[$property] = $result->$property;
if (!empty($result->$property)) {
--
GitLab