harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev'

Browse Source 
sync recent z6 protocol change

See merge request hubzilla/core!1541
This commit is contained in:
Mario 2019-03-06 09:47:40 +01:00
commit c43ab50d66
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Zotlabs/Lib/Libzot.php
View File

@ -685,9 +685,27 @@ class Libzot {
$adult_changed = 1; $adult_changed = 1;
if(intval($r[0]['xchan_deleted']) != intval($arr['deleted'])) if(intval($r[0]['xchan_deleted']) != intval($arr['deleted']))
$deleted_changed = 1; $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'])) if(intval($r[0]['xchan_pubforum']) != intval($arr['public_forum']))
$pubforum_changed = 1; $pubforum_changed = 1;
if($arr['protocols']) { if($arr['protocols']) {
$protocols = implode(',',$arr['protocols']); $protocols = implode(',',$arr['protocols']);
if($protocols !== 'zot6') { if($protocols !== 'zot6') {