aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-12-12 21:39:38 +0000
committerMario <mario@mariovavti.com>2020-12-12 22:41:38 +0100
commit634ace552d40f9f287a6419dd6fe5b19d3f390ca (patch)
tree6f28c1a243f186af7c7a6b90ea5afc1b65c515ac /include
parent751a1ba969b4a48b40d42022ed342db7e4e00c03 (diff)
downloadvolse-hubzilla-634ace552d40f9f287a6419dd6fe5b19d3f390ca.tar.gz
volse-hubzilla-634ace552d40f9f287a6419dd6fe5b19d3f390ca.tar.bz2
volse-hubzilla-634ace552d40f9f287a6419dd6fe5b19d3f390ca.zip
try to prevent hubloc confusion in some places
(cherry picked from commit 61cfeb5bdb749319357912d958cd13304b895bce)
Diffstat (limited to 'include')
-rw-r--r--include/channel.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/channel.php b/include/channel.php
index 71fad5222..88b8c2ceb 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -929,7 +929,7 @@ function identity_basic_export($channel_id, $sections = null, $zap_compat = fals
$ret['abook'] = $r;
for($x = 0; $x < count($ret['abook']); $x ++) {
-
+
$xchans[] = $ret['abook'][$x]['abook_xchan'];
$my_perms = [];
$their_perms = [];
@@ -951,24 +951,24 @@ function identity_basic_export($channel_id, $sections = null, $zap_compat = fals
}
$newconfig[] = $abc;
}
-
+
$ret['abook'][$x]['abconfig'] = $newconfig;
if ($zap_compat) {
$ret['abook'][$x]['abconfig'][] = [ 'chan' => $channel_id, 'xchan' => $ret['abook'][$x]['abook_chan'], 'cat' => 'system', 'k' => 'my_perms', 'v' => implode(',',$my_perms) ];
$ret['abook'][$x]['abconfig'][] = [ 'chan' => $channel_id, 'xchan' => $ret['abook'][$x]['abook_chan'], 'cat' => 'system', 'k' => 'their_perms', 'v' => implode(',',$their_perms) ];
- }
+ }
}
translate_abook_perms_outbound($ret['abook'][$x]);
-
+
}
// pick up the zot6 xchan and hublocs also
-
+
if($ret['channel']['channel_portable_id']) {
$xchans[] = $ret['channel']['channel_portable_id'];
}
-
+
stringify_array_elms($xchans);
}
@@ -1801,7 +1801,7 @@ function advanced_profile() {
$profile['howlong'] = relative_date(App::$profile['howlong'], t('for %1$d %2$s'));
}
- if(App::$profile['keywords']) {
+ if(App::$profile['keywords']) {
$keywords = str_replace(',',' ', App::$profile['keywords']);
$keywords = str_replace(' ',' ', $keywords);
$karr = explode(' ', $keywords);
@@ -2856,7 +2856,7 @@ function channel_remove($channel_id, $local = true, $unset_session = false) {
attach_delete($channel_id,$rv['hash']);
}
}
-
+
$r = q("select id from item where uid = %d", intval($channel_id));
if($r) {
foreach($r as $rv) {
@@ -2939,7 +2939,7 @@ function channel_remove_final($channel_id) {
q("delete from abook where abook_channel = %d", intval($channel_id));
q("delete from abconfig where chan = %d", intval($channel_id));
q("delete from pconfig where uid = %d", intval($channel_id));
-
+
}