Synced with master for conflicts

Synced with master branch to reduce conflicts

Author: dpDesignz

lib/ezQuery.php

@@ -393,6 +393,7 @@ private function conditionIs($key, $condition, $combine)
 
     private function retrieveConditions($whereConditions)
     {
+        $whereConditions = flattenWhereConditions($whereConditions);
         $whereKey = [];
         $whereValue = [];
         $operator = [];