diff options
| author | redmatrix <git@macgirvin.com> | 2016-06-23 18:12:26 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-06-23 18:12:26 -0700 |
| commit | b19bbf54736b83afaa26aa11ba95c7816c7f8599 (patch) | |
| tree | 4b6262bb04bbfd05ad53abf5da6f679b6e4a43f4 /include/zot.php | |
| parent | e5c66d94f22d0efcdec0796872e9be81bff1bb4e (diff) | |
| download | volse-hubzilla-b19bbf54736b83afaa26aa11ba95c7816c7f8599.tar.gz volse-hubzilla-b19bbf54736b83afaa26aa11ba95c7816c7f8599.tar.bz2 volse-hubzilla-b19bbf54736b83afaa26aa11ba95c7816c7f8599.zip | |
change AbConfig to use channel_id instead of channel_hash; which was a mistake in retrospect
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']); } } } |