diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-25 06:30:15 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-25 06:30:15 -0500 |
| commit | 83a42afddf6e5ffd04028431b36aed6ecadf5b9d (patch) | |
| tree | 26d7251cd032fb627c80345cc9cbc4384a66f46f /include/zot.php | |
| parent | 780f83a118146cf67509574ac88024c2cb03cf3a (diff) | |
| parent | ec3651d216a5eafcb8019825bc6751e6ffa8c198 (diff) | |
| download | volse-hubzilla-83a42afddf6e5ffd04028431b36aed6ecadf5b9d.tar.gz volse-hubzilla-83a42afddf6e5ffd04028431b36aed6ecadf5b9d.tar.bz2 volse-hubzilla-83a42afddf6e5ffd04028431b36aed6ecadf5b9d.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php index 2530e55bb..6dd789181 100644 --- a/include/zot.php +++ b/include/zot.php @@ -552,7 +552,7 @@ function zot_refresh($them, $channel = null, $force = false) { unset($new_connection[0]['abook_account']); unset($new_connection[0]['abook_channel']); - $abconfig = load_abconfig($channel['channel_hash'],$new_connection['abook_xchan']); + $abconfig = load_abconfig($channel['channel_id'],$new_connection['abook_xchan']); if($abconfig) $new_connection['abconfig'] = $abconfig; @@ -3335,8 +3335,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { if($abconfig) { // @fixme does not handle sync of del_abconfig foreach($abconfig as $abc) { - if($abc['chan'] === $channel['channel_hash']) - set_abconfig($abc['chan'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']); + set_abconfig($channel['channel_id'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']); } } } |