From 26d282aa63805fe0e43a59e7dfc48ee20cc5f11c Mon Sep 17 00:00:00 2001
From: Michael J Rubinsky <mrubinsk@horde.org>
Date: Sat, 9 Feb 2019 12:51:47 -0500
Subject: [PATCH] Fix specifying fields to return vs search.

---
 lib/Horde/Core/ActiveSync/Connector.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/Horde/Core/ActiveSync/Connector.php b/lib/Horde/Core/ActiveSync/Connector.php
index 4a96528dd..29df2ee40 100644
--- a/lib/Horde/Core/ActiveSync/Connector.php
+++ b/lib/Horde/Core/ActiveSync/Connector.php
@@ -513,17 +513,19 @@ public function resolveRecipient($query, array $opts = array())
         if (!in_array($gal, $sources)) {
             $sources[] = $gal;
         }
+        $returnFields = array();
         foreach ($sources as $source) {
-            $fields[$source] = array('name', 'email', 'alias', 'smimePublicKey');
+            $fields[$source] = array('email');
+            $returnFields[$source] = array('name', 'email', 'alias', 'smimePublicKey');
             if (!empty($opts['pictures'])) {
-                $fields[$source]['photo'];
+                $returnFields[$source]['photo'];
             }
         }
 
         $options = array(
             'matchBegin' => true,
             'sources' => $sources,
-            'fields' => $fields
+            'returnFields' => $fields
         );
         if (isset($opts['maxAmbiguous']) && $opts['maxAmbiguous'] == 0) {
             $options['customStrict'] = array('email', 'name', 'alias');