diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-24 11:25:20 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-24 11:25:20 +0200 |
| commit | c8ae04a96a38b7351c2ac506c836bb9b1734d58e (patch) | |
| tree | b15646cc7746f8b18dc844a9d7c8836c29bc7896 /include/zot.php | |
| parent | 39b14b6b811ec65f8c8a812397f9ee04877cd53d (diff) | |
| parent | c809b6f95e0c9717cba9cfad62b74104fbcc878d (diff) | |
| download | volse-hubzilla-c8ae04a96a38b7351c2ac506c836bb9b1734d58e.tar.gz volse-hubzilla-c8ae04a96a38b7351c2ac506c836bb9b1734d58e.tar.bz2 volse-hubzilla-c8ae04a96a38b7351c2ac506c836bb9b1734d58e.zip | |
Merge branch 'dev' into sabre32
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']); } } } |