aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-03-06 00:57:32 +0000
committerMario <mario@mariovavti.com>2019-03-06 09:49:18 +0100
commitc4714e95b6d51139889e787efaf7f046f32f58fe (patch)
tree18c1ebb6adb8a9f1867e5d6c0b9614b52330515e
parentd407e5556ef2ba5af620869d84394181f9628a57 (diff)
downloadvolse-hubzilla-c4714e95b6d51139889e787efaf7f046f32f58fe.tar.gz
volse-hubzilla-c4714e95b6d51139889e787efaf7f046f32f58fe.tar.bz2
volse-hubzilla-c4714e95b6d51139889e787efaf7f046f32f58fe.zip
maintain compatibility with recent zot6 changes
(cherry picked from commit 98b1c7a38c3f3ef8ba7d36b77d9366691c3fbf15)
-rw-r--r--Zotlabs/Lib/Libzot.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 019237568..22bbdf477 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -685,8 +685,14 @@ class Libzot {
$adult_changed = 1;
if(intval($r[0]['xchan_deleted']) != intval($arr['deleted']))
$deleted_changed = 1;
+ // old style
if(intval($r[0]['xchan_pubforum']) != intval($arr['public_forum']))
$pubforum_changed = 1;
+ // new style 6-MAR-2019
+ if(array_key_exists('channel_type',$arr) && intval($arr['channel_type']) < 2 && intval($r[0]['xchan_pubforum']) !== intval($arr['channel_type'])) {
+ $pubforum_changed = 1;
+ $arr['public_forum'] = $arr['channel_type'];
+ }
if($arr['protocols']) {
$protocols = implode(',',$arr['protocols']);