clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Michael Vogel 2018-04-12 23:43:43 +02:00 committed by GitHub
parent 33d60efd8e 130e16968e
commit c882dc8baf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boot.php
View File

@ -953,10 +953,12 @@ function public_contact()
*/ */
function remote_user() function remote_user()
{ {
// You cannot be both local and remote // You cannot be both local and remote.
if (local_user()) { // Unncommented by rabuzarus because remote authentication to local
return false; // profiles wasn't possible anymore (2018-04-12).
} // if (local_user()) {
// return false;
// }
if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) { if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) {
return intval($_SESSION['visitor_id']); return intval($_SESSION['visitor_id']);
} }