Merge pull request #7666 from MrPetovan/bug/7665-audio-tag

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 4c9a1a5e8c89e9bc34529af73f117b73bbbc8e74..224eba1f45b4f6267d71a6c43b013363440e5178 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -413,7 +413,7 @@ function public_contact()
  *
  * @return int|bool visitor_id or false
  */
-function remote_user($uid = 0)
+function remote_user($uid = null)
 {
        // You cannot be both local and remote.
        // Unncommented by rabuzarus because remote authentication to local
@@ -426,15 +426,15 @@ function remote_user($uid = 0)
                return false;
        }
 
-       if (!empty($uid) && !empty($_SESSION['remote'])) {
+       if (!is_null($uid) && !empty($_SESSION['remote'])) {
+               /// @todo replace it with this:
+               // if (!empty($_SESSION['remote'][$uid])) ...
                foreach ($_SESSION['remote'] as $visitor) {
                        if ($visitor['uid'] == $uid) {
                                return $visitor['cid'];
                        }
                }
-       }
-
-       if (!empty($_SESSION['visitor_id'])) {
+       } elseif (is_null($uid) && !empty($_SESSION['visitor_id'])) {
                return intval($_SESSION['visitor_id']);
        }