aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-03-05 17:06:42 -0800
committerzotlabs <mike@macgirvin.com>2019-03-05 17:06:42 -0800
commit26e7da0b969c834cc6c2ff7c00713c7be05cb5c4 (patch)
tree4607432b5edb5f172075e7f3ca8872f0178c9d70
parent98b1c7a38c3f3ef8ba7d36b77d9366691c3fbf15 (diff)
downloadvolse-hubzilla-26e7da0b969c834cc6c2ff7c00713c7be05cb5c4.tar.gz
volse-hubzilla-26e7da0b969c834cc6c2ff7c00713c7be05cb5c4.tar.bz2
volse-hubzilla-26e7da0b969c834cc6c2ff7c00713c7be05cb5c4.zip
channel_type is not integer
-rw-r--r--Zotlabs/Lib/Libzot.php22
1 files changed, 17 insertions, 5 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 7dca2e78a..4efd869f3 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -685,14 +685,26 @@ 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;
- // 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']);