mirror of
https://github.com/friendica/friendica
synced 2024-11-19 14:23:42 +00:00
Merge pull request #4823 from rabuzarus/20180412_-_enable_remote_user_if_local_user
local_user() could also be a remote_user()
This commit is contained in:
commit
c882dc8baf
1 changed files with 6 additions and 4 deletions
10
boot.php
10
boot.php
|
@ -953,10 +953,12 @@ function public_contact()
|
|||
*/
|
||||
function remote_user()
|
||||
{
|
||||
// You cannot be both local and remote
|
||||
if (local_user()) {
|
||||
return false;
|
||||
}
|
||||
// You cannot be both local and remote.
|
||||
// Unncommented by rabuzarus because remote authentication to local
|
||||
// profiles wasn't possible anymore (2018-04-12).
|
||||
// if (local_user()) {
|
||||
// return false;
|
||||
// }
|
||||
if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) {
|
||||
return intval($_SESSION['visitor_id']);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue