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 /Zotlabs/Module | |
| 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 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Follow.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Import.php | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index 72b854079..feed9cb1a 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -345,7 +345,7 @@ class Connedit extends \Zotlabs\Web\Controller { unset($clone['abook_account']); unset($clone['abook_channel']); - $abconfig = load_abconfig($channel['channel_hash'],$clone['abook_xchan']); + $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']); if($abconfig) $clone['abconfig'] = $abconfig; diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php index 1df382a89..3641330c9 100644 --- a/Zotlabs/Module/Follow.php +++ b/Zotlabs/Module/Follow.php @@ -43,7 +43,7 @@ class Follow extends \Zotlabs\Web\Controller { unset($clone['abook_account']); unset($clone['abook_channel']); - $abconfig = load_abconfig($channel['channel_hash'],$clone['abook_xchan']); + $abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']); if($abconfig) $clone['abconfig'] = $abconfig; diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index 4a559fe95..e34f5e49e 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -389,8 +389,7 @@ class Import extends \Zotlabs\Web\Controller { 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']); } } |