diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2016-06-21 15:25:44 +0200 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-06-21 15:25:44 +0200 |
| commit | 1452b74de7f5a3b3afae546b757d2a3889857a61 (patch) | |
| tree | 0eba5164f1af53876cdeac866e273ab7a40393a4 /apps/dav/lib/CardDAV/CardDavBackend.php | |
| parent | f2f1eab7f4ade9abb77f70c6a5c3244b5c6153f4 (diff) | |
| download | nextcloud-server-1452b74de7f5a3b3afae546b757d2a3889857a61.tar.gz nextcloud-server-1452b74de7f5a3b3afae546b757d2a3889857a61.zip | |
Contacts API: replace raw image data with url (#25081)
* add uri to AddressBookImpl array
* Introduce ImageExportPlugin for CardDav
* add plugin to v1 routes
* replace binary contact photo with link
* update tests
* Adding unit tests
Diffstat (limited to 'apps/dav/lib/CardDAV/CardDavBackend.php')
| -rw-r--r-- | apps/dav/lib/CardDAV/CardDavBackend.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 3d2904df39c..2ad9f4778c9 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -780,7 +780,7 @@ class CardDavBackend implements BackendInterface, SyncSupport { } $query2->andWhere($query2->expr()->eq('cp.addressbookid', $query->createNamedParameter($addressBookId))); - $query->select('c.carddata')->from($this->dbCardsTable, 'c') + $query->select('c.carddata', 'c.uri')->from($this->dbCardsTable, 'c') ->where($query->expr()->in('c.id', $query->createFunction($query2->getSQL()))); $result = $query->execute(); @@ -788,8 +788,10 @@ class CardDavBackend implements BackendInterface, SyncSupport { $result->closeCursor(); - return array_map(function($array) {return $this->readBlob($array['carddata']);}, $cards); - + return array_map(function($array) { + $array['carddata'] = $this->readBlob($array['carddata']); + return $array; + }, $cards); } /** |