diff options
| author | friendica <info@friendica.com> | 2014-11-05 16:21:03 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-11-05 16:21:03 -0800 |
| commit | 3b22e2f5f508cb5e45ae426210e5ca9fe9115417 (patch) | |
| tree | 93790ebab894b1133eac146f372810aae422cf79 /include | |
| parent | b16ee29cc338236264e62cf40248f54a1f785dbd (diff) | |
| download | volse-hubzilla-3b22e2f5f508cb5e45ae426210e5ca9fe9115417.tar.gz volse-hubzilla-3b22e2f5f508cb5e45ae426210e5ca9fe9115417.tar.bz2 volse-hubzilla-3b22e2f5f508cb5e45ae426210e5ca9fe9115417.zip | |
some minor cleanup of unreported (and as yet undiscovered) issues with permissions toggling. No smoking guns and no obvious issues discovered here. Repeated and tried to duplicate zottell's issue as described without seeing any obvious problems.
Diffstat (limited to 'include')
| -rw-r--r-- | include/follow.php | 5 | ||||
| -rw-r--r-- | include/identity.php | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/follow.php b/include/follow.php index b5196834d..421bdd083 100644 --- a/include/follow.php +++ b/include/follow.php @@ -203,8 +203,9 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) return $result; } - $r = q("select count(*) as total from abook where abook_account = %d and ( abook_flags & ABOOK_FLAG_FEED )", - intval($aid) + $r = q("select count(*) as total from abook where abook_account = %d and ( abook_flags & %d )", + intval($aid), + intval(ABOOK_FLAG_FEED) ); if($r) $total_feeds = $r[0]['total']; diff --git a/include/identity.php b/include/identity.php index 16e3eff0e..b9ee00623 100644 --- a/include/identity.php +++ b/include/identity.php @@ -376,6 +376,8 @@ function create_identity($arr) { set_pconfig($newuid,'system','permissions_role',$arr['permissions_role']); if(array_key_exists('online',$role_permissions)) set_pconfig($newuid,'system','hide_presence',1-intval($role_permissions['online'])); + if(array_key_exists('perms_auto',$role_permissions)) + set_pconfig($newuid,'system','autoperms',(($role_permissions['perms_auto']) ? $role_permissions['perms_accept'] : 0)); } // Create a group with yourself as a member. This allows somebody to use it |