diff options
| author | Mario <mario@mariovavti.com> | 2019-04-26 09:34:58 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-04-26 09:34:58 +0200 |
| commit | a6f50b8c858fa631613e429a0ce32dea9aec2df1 (patch) | |
| tree | 0cb26f646dd857d0061a0bf7d5749e7e5bdf9bf4 /include/channel.php | |
| parent | b57dcc74d1ea745938ea0da9d9145e87245900cf (diff) | |
| parent | e2dfa1d72f36ecc85059a7f2a38084a4919eb704 (diff) | |
| download | volse-hubzilla-a6f50b8c858fa631613e429a0ce32dea9aec2df1.tar.gz volse-hubzilla-a6f50b8c858fa631613e429a0ce32dea9aec2df1.tar.bz2 volse-hubzilla-a6f50b8c858fa631613e429a0ce32dea9aec2df1.zip | |
Merge branch 'dev' into 'dev'
import/export zot6 hublocs+xchans
See merge request hubzilla/core!1610
Diffstat (limited to 'include/channel.php')
| -rw-r--r-- | include/channel.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/channel.php b/include/channel.php index 47a7b5a0e..e4b6df47b 100644 --- a/include/channel.php +++ b/include/channel.php @@ -873,6 +873,13 @@ function identity_basic_export($channel_id, $sections = null) { $ret['abook'][$x]['abconfig'] = $abconfig; translate_abook_perms_outbound($ret['abook'][$x]); } + + // pick up the zot6 xchan and hublocs also + + if($ret['channel']['channel_portable_id']) { + $xchans[] = $ret['channel']['channel_portable_id']; + } + stringify_array_elms($xchans); } |