summaryrefslogtreecommitdiffstats
path: root/apps/federation
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-01 23:20:42 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-01 23:20:42 +0100
commit333bb5a2276335189d4a5c1ad08c7cfef98b9cb3 (patch)
tree06f6c7bc77e98cce4184e7b68578c28b2602dc03 /apps/federation
parentb4853f3fce696b8b89f0dd898b25d7fde93e1a92 (diff)
parent2f739a89f524ce39873e159d0129cfb3e5c9a88b (diff)
downloadnextcloud-server-333bb5a2276335189d4a5c1ad08c7cfef98b9cb3.tar.gz
nextcloud-server-333bb5a2276335189d4a5c1ad08c7cfef98b9cb3.zip
Merge pull request #22050 from owncloud/fix_sync_addressbook
pass parameter in the right order to syncRemoteAddressBook()
Diffstat (limited to 'apps/federation')
-rw-r--r--apps/federation/lib/syncfederationaddressbooks.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/federation/lib/syncfederationaddressbooks.php b/apps/federation/lib/syncfederationaddressbooks.php
index 86fc4179dc4..6419fdddf8e 100644
--- a/apps/federation/lib/syncfederationaddressbooks.php
+++ b/apps/federation/lib/syncfederationaddressbooks.php
@@ -46,7 +46,7 @@ class SyncFederationAddressBooks {
'{DAV:}displayname' => $url
];
try {
- $newToken = $this->syncService->syncRemoteAddressBook($url, 'system', $sharedSecret, $syncToken, $targetPrincipal, $targetBookId, $targetBookProperties);
+ $newToken = $this->syncService->syncRemoteAddressBook($url, 'system', $sharedSecret, $syncToken, $targetBookId, $targetPrincipal, $targetBookProperties);
if ($newToken !== $syncToken) {
$this->dbHandler->setServerStatus($url, TrustedServers::STATUS_OK, $newToken);
}