diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-09-18 08:41:41 +0200 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-09-18 08:41:41 +0200 |
| commit | 7da97c198182f8f6f4286e16d80de205431d81bb (patch) | |
| tree | d03c22c98fa5e522fef874554be307969154c792 /include/follow.php | |
| parent | 4f793069bf4aafcfe77d50e47690173104ef23c7 (diff) | |
| parent | 0b47fb9a91b58147e616ea75a23dea0d431c40f8 (diff) | |
| download | volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.tar.gz volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.tar.bz2 volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.zip | |
Merge pull request #3 from friendica/master
Merge from upstream
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']; + } } } |