Merge pull request #6360 from monishdeb/search-fixes-master

CRM-16941 - Search Form and api.Get fixes for Contact

diff --cc CRM/Contact/BAO/Group.php
Simple merge

diff --cc CRM/Contact/BAO/GroupContactCache.php
Simple merge

diff --cc CRM/Contact/BAO/Query.php
index 863ea6fafa1ff6789a7965ccc6659e280e6decd5,5b9fbc2e9e46061cf227f76e036765d31a13367f..351b3dc6d2c8e2ccf5c387ac4aee11ecbc5c81f4
--- 1/CRM/Contact/BAO/Query.php
--- 2/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@@ -2792,17 -2754,8 +2744,8 @@@ class CRM_Contact_BAO_Query 
      $isSmart = FALSE;
      $isNotOp = ($op == 'NOT IN' || $op == '!=');
  
-     if ($value) {
-       if (strpos($op, 'IN') === FALSE) {
-         $value = key($value);
-       }
-       else {
-         $value = array_keys($value);
-       }
-     }
- 
      $statii = array();
 -    $gcsValues = &$this->getWhereValues('group_contact_status', $grouping);
 +    $gcsValues = $this->getWhereValues('group_contact_status', $grouping);
      if ($gcsValues &&
        is_array($gcsValues[2])
      ) {

diff --cc CRM/Contact/Form/Search/Advanced.php
Simple merge

diff --cc CRM/Contact/Form/Search/Basic.php
Simple merge

diff --cc CRM/Contact/Form/Search/Builder.php
Simple merge

diff --cc CRM/Contact/Form/Search/Criteria.php
Simple merge

diff --cc CRM/Contact/Selector.php
Simple merge

diff --cc CRM/Core/BAO/Mapping.php
Simple merge