diff options
| author | Max Kostikov <max@kostikov.co> | 2020-12-20 00:01:50 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-12-20 00:01:50 +0100 |
| commit | 5de4c3cc3f42c8ba0c1a000a308312252890f878 (patch) | |
| tree | 72b8c60ba36a954e9f8ec1f67e56308d3086a542 /include/import.php | |
| parent | 57f6f54f29623972abc980b5e87c7933e32d1d3a (diff) | |
| parent | 6579007ca080a7d126be0c3130043f754eb6ac2e (diff) | |
| download | volse-hubzilla-5de4c3cc3f42c8ba0c1a000a308312252890f878.tar.gz volse-hubzilla-5de4c3cc3f42c8ba0c1a000a308312252890f878.tar.bz2 volse-hubzilla-5de4c3cc3f42c8ba0c1a000a308312252890f878.zip | |
Merge branch 'dev' into 'dev'
Use Zot6 for CardDAV and CalDAV sync between clones
See merge request hubzilla/core!1886
Diffstat (limited to 'include/import.php')
| -rw-r--r-- | include/import.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/import.php b/include/import.php index cfbb8775d..d02cc1e1f 100644 --- a/include/import.php +++ b/include/import.php @@ -1554,6 +1554,7 @@ function sync_addressbook($channel, $data) { $id = get_cdav_id($principalUri, $data['uri'], 'addressbooks'); if(! $id) return; + $id = $id['id']; } $pdo = \DBA::$dba->db; |