diff options
author | zotlabs <mike@macgirvin.com> | 2020-05-05 19:42:00 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2020-05-05 19:42:00 -0700 |
commit | 79968ea07aa205e9c93993724d3f37362220b9d4 (patch) | |
tree | 053bbcc9c213bd2e1da2b4a1c464be771929b2c3 /Zotlabs/Module/Viewconnections.php | |
parent | 7a0d9a449492ff3b5ef97b997310ed26ec1f53e4 (diff) | |
parent | 06d1cf83d2b1acfef5529fe388d2502bea381881 (diff) | |
download | volse-hubzilla-79968ea07aa205e9c93993724d3f37362220b9d4.tar.gz volse-hubzilla-79968ea07aa205e9c93993724d3f37362220b9d4.tar.bz2 volse-hubzilla-79968ea07aa205e9c93993724d3f37362220b9d4.zip |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module/Viewconnections.php')
-rw-r--r-- | Zotlabs/Module/Viewconnections.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Zotlabs/Module/Viewconnections.php b/Zotlabs/Module/Viewconnections.php index 320a331d1..a0c293ddf 100644 --- a/Zotlabs/Module/Viewconnections.php +++ b/Zotlabs/Module/Viewconnections.php @@ -97,7 +97,6 @@ class Viewconnections extends \Zotlabs\Web\Controller { $perminfo['connperms'] .= t('Nothing'); } - $url = chanlink_hash($rr['xchan_hash']); if($url) { $contacts[] = array( @@ -111,13 +110,12 @@ class Viewconnections extends \Zotlabs\Web\Controller { 'sparkle' => '', 'itemurl' => $rr['url'], 'network' => '', - 'perminfo' => $perminfo, + 'perminfo' => (($is_owner) ? $perminfo : (($perminfo['connpermcount'] === 0) ? $perminfo : [])), 'oneway' => $oneway ); } } - - + if($_REQUEST['aj']) { if($contacts) { $o = replace_macros(get_markup_template('viewcontactsajax.tpl'),array( |