diff options
| author | Mario <mario@mariovavti.com> | 2021-05-11 11:59:49 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-05-11 11:59:49 +0000 |
| commit | 26e851ff7fc074592f93088dbd96713b22defe8b (patch) | |
| tree | e727d9a83590b152ddd63a8c8e7756835c45de4a /Zotlabs/Lib/Connect.php | |
| parent | 406ca206347152cf4acbdcb81fc8152d83f99182 (diff) | |
| parent | 89ec043ce1183dbae5ff10a994f0f819a8544ba9 (diff) | |
| download | volse-hubzilla-26e851ff7fc074592f93088dbd96713b22defe8b.tar.gz volse-hubzilla-26e851ff7fc074592f93088dbd96713b22defe8b.tar.bz2 volse-hubzilla-26e851ff7fc074592f93088dbd96713b22defe8b.zip | |
Merge branch '5.6RC'
Diffstat (limited to 'Zotlabs/Lib/Connect.php')
| -rw-r--r-- | Zotlabs/Lib/Connect.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Lib/Connect.php b/Zotlabs/Lib/Connect.php index 481b02ce2..21bec171b 100644 --- a/Zotlabs/Lib/Connect.php +++ b/Zotlabs/Lib/Connect.php @@ -207,13 +207,13 @@ class Connect { } $my_perms = $p['perms']; - + $profile_assign = get_pconfig($uid,'system','profile_assign',''); // See if we are already connected by virtue of having an abook record - $r = q("select abook_id, abook_xchan, abook_pending, abook_instance from abook + $r = q("select abook_id, abook_xchan, abook_pending, abook_instance from abook where abook_xchan = '%s' and abook_channel = %d limit 1", dbesc($xchan_hash), intval($uid) @@ -282,7 +282,7 @@ class Connect { // fetch the entire record - $r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash + $r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d limit 1", dbesc($xchan_hash), intval($uid) |