From eefbeff4b9824b58b3c458091d6b998d45e74869 Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Wed, 18 Feb 2015 15:52:00 +0400
Subject: [PATCH] Fixed ownCloud contacts suggestions

---
 .../Suggestions/OwnCloudSuggestions.php       | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php
index a716058b1..1484597fa 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/OwnCloudSuggestions.php
@@ -31,6 +31,9 @@ class OwnCloudSuggestions implements \RainLoop\Providers\Suggestions\ISuggestion
 			}
 
 			$aSearchResult = \OCP\Contacts::search($sQuery, array('FN', 'EMAIL'));
+			//$this->oLogger->WriteDump($aSearchResult);
+
+			$aPreResult = array();
 			if (\is_array($aSearchResult) && 0 < \count($aSearchResult))
 			{
 				foreach ($aSearchResult as $aContact)
@@ -51,22 +54,35 @@ class OwnCloudSuggestions implements \RainLoop\Providers\Suggestions\ISuggestion
 							$mEmails = array($mEmails);
 						}
 
+						if (!isset($aPreResult[$sUid]))
+						{
+							$aPreResult[$sUid] = array();
+						}
+
 						foreach ($mEmails as $sEmail)
 						{
 							$sEmail = \trim($sEmail);
 							if (!empty($sEmail))
 							{
 								$iLimit--;
-								$aResult[$sUid] = array($sEmail, $sFullName);
+								$aPreResult[$sUid][] = array($sEmail, $sFullName);
 							}
 						}
 					}
 				}
 
-				$aResult = \array_values($aResult);
+				$aPreResult = \array_values($aPreResult);
+//				$this->oLogger->WriteDump($aPreResult);
+				foreach ($aPreResult as $aData)
+				{
+					foreach ($aData as $aSubData)
+					{
+						$aResult[] = $aSubData;
+					}
+				}
 			}
 
-			unset($aSearchResult);
+			unset($aSearchResult, $aPreResult);
 		}
 		catch (\Exception $oException)
 		{