summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-04-22 14:20:53 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-04-22 14:20:53 +0200
commit0330481c5e690237f6b93cfe618ca059d75cde5f (patch)
tree0dd59d1107504100d0192879c91b01b7b97cb0e6 /lib
parentd56072cf2ed07069fe8060af47d8f752590d1f8a (diff)
parentefff7dd2a43b604bd883e4e0aca9a74e4bb81222 (diff)
downloadnextcloud-server-0330481c5e690237f6b93cfe618ca059d75cde5f.tar.gz
nextcloud-server-0330481c5e690237f6b93cfe618ca059d75cde5f.zip
Merge pull request #8263 from LEDfan/add-key-to-contacts
Add key to every contact
Diffstat (limited to 'lib')
-rw-r--r--lib/private/contactsmanager.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/private/contactsmanager.php b/lib/private/contactsmanager.php
index 1cb3da7098f..4299d88017a 100644
--- a/lib/private/contactsmanager.php
+++ b/lib/private/contactsmanager.php
@@ -37,7 +37,12 @@ namespace OC {
$result = array();
foreach($this->address_books as $address_book) {
$r = $address_book->search($pattern, $searchProperties, $options);
- $result = array_merge($result, $r);
+ $contacts = array();
+ foreach($r as $c){
+ $c['addressbook-key'] = $address_book->getKey();
+ $contacts[] = $c;
+ }
+ $result = array_merge($result, $contacts);
}
return $result;