diff options
| author | Mario <mario@mariovavti.com> | 2020-11-05 08:46:42 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-11-05 08:46:42 +0000 |
| commit | bafbf0416462c6f18c3fb6c8c06a063c8d6fdae6 (patch) | |
| tree | 8929845be585b09d0f420621281c5531e1efad3e /include/auth.php | |
| parent | 6f93d9848c43019d43ea76c27d42d657ba031cd7 (diff) | |
| parent | fdefa101d84dc2a9424eaedbdb003a4c30ec5d01 (diff) | |
| download | volse-hubzilla-bafbf0416462c6f18c3fb6c8c06a063c8d6fdae6.tar.gz volse-hubzilla-bafbf0416462c6f18c3fb6c8c06a063c8d6fdae6.tar.bz2 volse-hubzilla-bafbf0416462c6f18c3fb6c8c06a063c8d6fdae6.zip | |
Merge branch '5.0RC'5.0
Diffstat (limited to 'include/auth.php')
| -rw-r--r-- | include/auth.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/auth.php b/include/auth.php index b952754fd..8eeb077b5 100644 --- a/include/auth.php +++ b/include/auth.php @@ -9,6 +9,8 @@ * Also provides a function for OpenID identiy matching. */ +use Zotlabs\Lib\Libzot; + require_once('include/api_auth.php'); require_once('include/security.php'); @@ -224,12 +226,13 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) && $r = array(atoken_xchan($y[0])); } else { - $r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where xchan_hash = '%s' limit 1", + $r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where xchan_hash = '%s' and hubloc_deleted = 0", dbesc($_SESSION['visitor_id']) ); } if($r) { - App::set_observer($r[0]); + $r = Libzot::zot_record_preferred($r); + App::set_observer($r); } else { unset($_SESSION['visitor_id']); |