Merge pull request #23568 from owncloud/finally-fix-23328-now-for-addressbooks-as-well
Handle group shares of addressbooks on v1 as well ... now FINALLY ....
This commit is contained in:
commit
cd850dc325
|
@ -99,6 +99,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
function getAddressBooksForUser($principalUri) {
|
function getAddressBooksForUser($principalUri) {
|
||||||
|
$principalUriOriginal = $principalUri;
|
||||||
$principalUri = $this->convertPrincipal($principalUri, true);
|
$principalUri = $this->convertPrincipal($principalUri, true);
|
||||||
$query = $this->db->getQueryBuilder();
|
$query = $this->db->getQueryBuilder();
|
||||||
$query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
|
$query->select(['id', 'uri', 'displayname', 'principaluri', 'description', 'synctoken'])
|
||||||
|
@ -122,7 +123,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
|
||||||
$result->closeCursor();
|
$result->closeCursor();
|
||||||
|
|
||||||
// query for shared calendars
|
// query for shared calendars
|
||||||
$principals = $this->principalBackend->getGroupMembership($principalUri, true);
|
$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
|
||||||
$principals[]= $principalUri;
|
$principals[]= $principalUri;
|
||||||
|
|
||||||
$query = $this->db->getQueryBuilder();
|
$query = $this->db->getQueryBuilder();
|
||||||
|
|
Loading…
Reference in New Issue