diff options
| -rw-r--r-- | include/follow.php | 5 | ||||
| -rw-r--r-- | include/identity.php | 2 | ||||
| -rw-r--r-- | mod/settings.php | 1 | ||||
| -rw-r--r-- | version.inc | 2 |
4 files changed, 7 insertions, 3 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 diff --git a/mod/settings.php b/mod/settings.php index 253e801a8..309be0797 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -337,6 +337,7 @@ function settings_post(&$a) { intval(local_user()), intval(ABOOK_FLAG_SELF) ); + set_pconfig(local_user(),'system','autoperms',(($role_permissions['perms_auto']) ? intval($role_permissions['perms_accept']) : 0)); foreach($role_permissions as $p => $v) { if(strpos($p,'channel_') !== false) { diff --git a/version.inc b/version.inc index 50fb9a9a8..b83d89a30 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-11-04.849 +2014-11-05.850 |