test failure fix

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 58d31d797f189aaad323608732a9153fad9622bb..002d42873f7ea4c6350f2c6c09f2c9d4bdc3356a 100644 (file)
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -1584,7 +1584,9 @@ class CRM_Contact_BAO_Query {
       // prior to 4.7, formValues for some attributes (e.g. group, tag) are stored in array(id1 => 1, id2 => 1),
       // as per the recent Search fixes $values need to be in standard array(id1, id2) format
       $ids = array_keys($values, 1);
-      if (count($ids) > 1 || (count($ids) == 1 && key($values) > 1)) {
+      if (count($ids) > 1 ||
+        (count($ids) == 1 && (key($values) > 1 || (key($values) == 1 && $values[1] == 1))) // handle (0 => 4), (1 => 1)
+      ) {
         $values = $ids;
       }
     }

diff --git a/tests/phpunit/CRM/Contact/BAO/QueryTest.php b/tests/phpunit/CRM/Contact/BAO/QueryTest.php
index 5aeb61c656ce17bb0b663a6c2f75d302153860c5..1ff3bc78a78eb9ff6b3e246277a5ae65f0001256 100644 (file)
--- a/tests/phpunit/CRM/Contact/BAO/QueryTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/QueryTest.php
@@ -199,7 +199,7 @@ class CRM_Contact_BAO_QueryTest extends CiviUnitTestCase {
    */
   public function testGroupContactCacheAddSearch() {
     $returnProperties = array('contact_id');
-    $params = array(array('group', 'IN', array(1 => 1), 0, 0));
+    $params = array(array('group', 'IN', array(1), 0, 0));
 
     $query = new CRM_Contact_BAO_Query(
       $params, $returnProperties,