Merge branch 'dev' into 'dev'
sync recent z6 protocol change See merge request hubzilla/core!1541
This commit is contained in:
commit
c43ab50d66
@ -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') {
|
||||
|
Reference in New Issue
Block a user