aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-07-30 17:41:37 -0700
committerzotlabs <mike@macgirvin.com>2018-07-30 17:41:37 -0700
commite8aeecc4c9842d4c6b25f7b488ede9644afc5d78 (patch)
tree5917ab02693599f5a069667c404f32a1dd649c86 /Zotlabs/Module
parent32614e4074758d6112993d71169664a3c29e90b2 (diff)
downloadvolse-hubzilla-e8aeecc4c9842d4c6b25f7b488ede9644afc5d78.tar.gz
volse-hubzilla-e8aeecc4c9842d4c6b25f7b488ede9644afc5d78.tar.bz2
volse-hubzilla-e8aeecc4c9842d4c6b25f7b488ede9644afc5d78.zip
When checking permissions ignore checking site "Block Public" settings in cases where site permissions aren't applicable
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Connedit.php2
-rw-r--r--Zotlabs/Module/Defperms.php1
-rw-r--r--Zotlabs/Module/Settings/Tokens.php2
3 files changed, 2 insertions, 3 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index cb9c19cf0..712215bc3 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -774,7 +774,7 @@ class Connedit extends \Zotlabs\Web\Controller {
$global_perms = \Zotlabs\Access\Permissions::Perms();
- $existing = get_all_perms(local_channel(),$contact['abook_xchan']);
+ $existing = get_all_perms(local_channel(),$contact['abook_xchan'],false);
$unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication'), array(t('No'),('Yes')));
diff --git a/Zotlabs/Module/Defperms.php b/Zotlabs/Module/Defperms.php
index 97d9cfd1d..63acc9795 100644
--- a/Zotlabs/Module/Defperms.php
+++ b/Zotlabs/Module/Defperms.php
@@ -209,7 +209,6 @@ class Defperms extends \Zotlabs\Web\Controller {
$global_perms = \Zotlabs\Access\Permissions::Perms();
- $existing = get_all_perms(local_channel(),$contact['abook_xchan']);
$hidden_perms = [];
foreach($global_perms as $k => $v) {
diff --git a/Zotlabs/Module/Settings/Tokens.php b/Zotlabs/Module/Settings/Tokens.php
index 619c8b5ba..e59cf8d1c 100644
--- a/Zotlabs/Module/Settings/Tokens.php
+++ b/Zotlabs/Module/Settings/Tokens.php
@@ -117,7 +117,7 @@ class Tokens {
$global_perms = \Zotlabs\Access\Permissions::Perms();
$their_perms = [];
- $existing = get_all_perms(local_channel(),(($atoken_xchan) ? $atoken_xchan : ''));
+ $existing = get_all_perms(local_channel(),(($atoken_xchan) ? $atoken_xchan : ''),false);
if($atoken_xchan) {
$theirs = q("select * from abconfig where chan = %d and xchan = '%s' and cat = 'their_perms'",