diff options
| author | Mario <mario@mariovavti.com> | 2021-12-15 12:17:19 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-12-15 12:17:19 +0000 |
| commit | 2968bf8241d2969c4d51f1651fc3f8c7688b2fca (patch) | |
| tree | db015d27098c546c32f41682e3b7dac2480b890e /Zotlabs/Lib/Connect.php | |
| parent | b37165c62b1037e504d4b68a507241acf97ede5e (diff) | |
| download | volse-hubzilla-2968bf8241d2969c4d51f1651fc3f8c7688b2fca.tar.gz volse-hubzilla-2968bf8241d2969c4d51f1651fc3f8c7688b2fca.tar.bz2 volse-hubzilla-2968bf8241d2969c4d51f1651fc3f8c7688b2fca.zip | |
merge branch perms_ng into dev
Diffstat (limited to 'Zotlabs/Lib/Connect.php')
| -rw-r--r-- | Zotlabs/Lib/Connect.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Connect.php b/Zotlabs/Lib/Connect.php index 38fe69995..0b9ff7089 100644 --- a/Zotlabs/Lib/Connect.php +++ b/Zotlabs/Lib/Connect.php @@ -261,7 +261,8 @@ class Connect { 'abook_feed' => intval(($xchan['xchan_network'] === 'rss') ? 1 : 0), 'abook_created' => datetime_convert(), 'abook_updated' => datetime_convert(), - 'abook_instance' => (($singleton) ? z_root() : '') + 'abook_instance' => (($singleton) ? z_root() : ''), + 'abook_role' => get_pconfig($uid, 'system', 'default_permcat', 'default') ] ); } @@ -300,7 +301,7 @@ class Connect { /** If there is a default group for this channel, add this connection to it */ if ($default_group) { - $g = AccessList::rec_byhash($uid,$default_group); + $g = AccessList::by_hash($uid,$default_group); if ($g) { AccessList::member_add($uid,'',$xchan_hash,$g['id']); } |