mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get only vcards which match both the address book id and the vcard uri (#25294)

This commit is contained in:
Björn Schießle 2016-06-29 12:13:59 +02:00 committed by Thomas Müller
parent 2b0f053126
commit 5ace6b53f3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/CardDAV/CardDavBackend.php
View File

@ -848,7 +848,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
$query = $this->db->getQueryBuilder(); $query = $this->db->getQueryBuilder();
$query->select('*')->from($this->dbCardsTable) $query->select('*')->from($this->dbCardsTable)
->where($query->expr()->eq('uri', $query->createNamedParameter($uri))) ->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId))); ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
$queryResult = $query->execute(); $queryResult = $query->execute();
$contact = $queryResult->fetch(); $contact = $queryResult->fetch();
$queryResult->closeCursor(); $queryResult->closeCursor();

4
apps/dav/tests/unit/CardDAV/CardDavBackendTest.php
View File

@ -606,6 +606,10 @@ class CardDavBackendTest extends TestCase {
$this->assertSame(5489543, (int)$result['lastmodified']); $this->assertSame(5489543, (int)$result['lastmodified']);
$this->assertSame('etag0', $result['etag']); $this->assertSame('etag0', $result['etag']);
$this->assertSame(120, (int)$result['size']); $this->assertSame(120, (int)$result['size']);
// this shouldn't return any result because 'uri1' is in address book 1
$result = $this->backend->getContact(0, 'uri1');
$this->assertEmpty($result);
} }
public function testGetContactFail() { public function testGetContactFail() {