Merge pull request #3665 from annando/local-remote-user

Bugfix: You cannot be local and remote at the same time
2017-08-28 06:55:22 +02:00 · 2017-08-28 06:55:22 +02:00 · 0c1c39b679
parent f27a731676 21d27c2124
commit 0c1c39b679
1 changed files with 4 additions and 0 deletions
--- a/boot.php
+++ b/boot.php
@ -947,6 +947,10 @@ function public_contact() {
 * @return int|bool visitor_id or false
 */
 function remote_user() {
+	// You cannot be both local and remote
+	if (local_user()) {
+		return false;
+	}
 	if ((x($_SESSION, 'authenticated')) && (x($_SESSION, 'visitor_id'))) {
 		return intval($_SESSION['visitor_id']);
 	}