diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-18 18:07:38 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-18 18:07:38 +0100 |
| commit | bdfe2c77868afd59716103091b0dfa05060252d5 (patch) | |
| tree | 83bb1d5522e2c12ea778c84879f269ab56d712c0 /include/follow.php | |
| parent | 68ecc673b109be50dc04cf72af8ce2296c70b86b (diff) | |
| parent | 595be9919b0ce85087937985444477189381976c (diff) | |
| download | volse-hubzilla-bdfe2c77868afd59716103091b0dfa05060252d5.tar.gz volse-hubzilla-bdfe2c77868afd59716103091b0dfa05060252d5.tar.bz2 volse-hubzilla-bdfe2c77868afd59716103091b0dfa05060252d5.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/follow.php')
| -rw-r--r-- | include/follow.php | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/follow.php b/include/follow.php index 18a9e66ea..3c1fcd890 100644 --- a/include/follow.php +++ b/include/follow.php @@ -63,6 +63,13 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $my_perms = PERMS_W_STREAM|PERMS_W_MAIL; + $role = get_pconfig($uid,'system','permissions_role'); + if($role) { + $x = get_role_perms($role); + if($x['perms_follow']) + $my_perms = $x['perms_follow']; + } + logger('follow: ' . $url . ' ' . print_r($j,true), LOGGER_DEBUG); @@ -153,6 +160,12 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $xchan_hash = $r[0]['xchan_hash']; $their_perms = 0; $my_perms = PERMS_W_STREAM|PERMS_W_MAIL; + $role = get_pconfig($uid,'system','permissions_role'); + if($role) { + $x = get_role_perms($role); + if($x['perms_follow']) + $my_perms = $x['perms_follow']; + } } } |