aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-11-05 19:34:10 -0800
committerzotlabs <mike@macgirvin.com>2018-11-05 19:34:10 -0800
commitfabcf841c9b4a360e2e496d04775e2ef594cb0e3 (patch)
tree7dbbf985d0f1359c96a887bb4e5a919d89e0f7fb /Zotlabs/Lib
parent43a5f928bae3d886dd355497d63ad961425cb3c4 (diff)
downloadvolse-hubzilla-fabcf841c9b4a360e2e496d04775e2ef594cb0e3.tar.gz
volse-hubzilla-fabcf841c9b4a360e2e496d04775e2ef594cb0e3.tar.bz2
volse-hubzilla-fabcf841c9b4a360e2e496d04775e2ef594cb0e3.zip
z6 work
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/Libzot.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 2c726aff4..3d18df051 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -324,11 +324,12 @@ class Libzot {
logger('zot-info: ' . print_r($record,true), LOGGER_DATA, LOG_DEBUG);
$x = self::import_xchan($record['data'], (($force) ? UPDATE_FLAGS_FORCED : UPDATE_FLAGS_UPDATED));
-
+logger('1');
if(! $x['success'])
return false;
-
+logger('2');
if($channel && $record['data']['permissions']) {
+logger('3');
$old_read_stream_perm = their_perms_contains($channel['channel_id'],$x['hash'],'view_stream');
set_abconfig($channel['channel_id'],$x['hash'],'system','their_perms',$record['data']['permissions']);
@@ -350,7 +351,7 @@ class Libzot {
);
if($r) {
-
+logger('4');
// connection exists
// if the dob is the same as what we have stored (disregarding the year), keep the one
@@ -2749,7 +2750,7 @@ class Libzot {
];
$ret['channel_role'] = get_pconfig($e['channel_id'],'system','permissions_role','custom');
- $ret['protocols'] = [ 'zot6' ];
+ $ret['protocols'] = [ 'zot', 'zot6' ];
$ret['searchable'] = $searchable;
$ret['adult_content'] = $adult_channel;
$ret['public_forum'] = $public_forum;