From 993eaa05d820707c380b76547a56ed4671115ff1 Mon Sep 17 00:00:00 2001
From: monishdeb <monish.deb@webaccessglobal.com>
Date: Fri, 5 Jun 2015 03:59:51 +0530
Subject: [PATCH] api tests fix

---
 CRM/Contact/BAO/Query.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index b0a743bb99..3f3d19b858 100644
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -5698,12 +5698,15 @@ AND   displayRelType.is_active = 1
       $pseduoOptions = CRM_Core_PseudoConstant::get($daoName, $fieldName, $pseduoExtraParam = array());
     }
 
+    //API usually have fieldValue format as array(operator => array(values)),
+    //so we need to separate operator out of fieldValue param
+    if (is_array($fieldValue) && in_array(key($fieldValue), CRM_Core_DAO::acceptedSQLOperators(), TRUE)) {
+      $op = key($fieldValue);
+      $fieldValue = $fieldValue[$op];
+    }
+
     if (is_array($fieldValue)) {
       $qillString = array();
-      if (in_array(key($fieldValue), CRM_Core_DAO::acceptedSQLOperators(), TRUE)) {
-        $op = key($fieldValue);
-        $fieldValue = $fieldValue[$op];
-      }
       if (!empty($pseduoOptions)) {
         foreach ((array) $fieldValue as $val) {
           $qillString[] = $pseduoOptions[$val];
-- 
2.25.1