diff options
author | Mario <mario@mariovavti.com> | 2019-03-06 09:47:40 +0100 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2019-03-06 09:47:40 +0100 |
commit | c43ab50d6618724d8cf7ce4d691db5edca3ac8e0 (patch) | |
tree | 4607432b5edb5f172075e7f3ca8872f0178c9d70 | |
parent | ccdbec619c5ca26b255797465ce4d0da50a66df9 (diff) | |
parent | 26e7da0b969c834cc6c2ff7c00713c7be05cb5c4 (diff) | |
download | volse-hubzilla-c43ab50d6618724d8cf7ce4d691db5edca3ac8e0.tar.gz volse-hubzilla-c43ab50d6618724d8cf7ce4d691db5edca3ac8e0.tar.bz2 volse-hubzilla-c43ab50d6618724d8cf7ce4d691db5edca3ac8e0.zip |
Merge branch 'dev' into 'dev'
sync recent z6 protocol change
See merge request hubzilla/core!1541
-rw-r--r-- | Zotlabs/Lib/Libzot.php | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 6190c9970..4efd869f3 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -685,9 +685,27 @@ class Libzot { $adult_changed = 1; if(intval($r[0]['xchan_deleted']) != intval($arr['deleted'])) $deleted_changed = 1; + + // new style 6-MAR-2019 + + if(array_key_exists('channel_type',$arr)) { + if($arr['channel_type'] === 'collection') { + // do nothing at this time. + } + elseif($arr['channel_type'] === 'group') { + $arr['public_forum'] = 1; + } + else { + $arr['public_forum'] = 0; + } + } + + // old style + if(intval($r[0]['xchan_pubforum']) != intval($arr['public_forum'])) $pubforum_changed = 1; + if($arr['protocols']) { $protocols = implode(',',$arr['protocols']); if($protocols !== 'zot6') { |