Merge pull request #10040 from annando/file-permissions

[friendica.git] / src / Core / Session.php

diff --git a/src/Core/Session.php b/src/Core/Session.php
index b15b53c4eef4ecc04e709a6f7b9b9f3d39dd6f09..c4fbb3f8c6d043b9764a0ef2623c64a92e2752d9 100644 (file)
--- a/src/Core/Session.php
+++ b/src/Core/Session.php
@@ -74,11 +74,19 @@ class Session
        {
                $session = DI::session();
 
-               if (empty($session->get('remote')[$uid])) {
-                       return 0;
+               if (!empty($session->get('remote')[$uid])) {
+                       $remote = $session->get('remote')[$uid];
+               } else {
+                       $remote = 0;
                }
 
-               return $session->get('remote')[$uid];
+               $local_user = !empty($session->get('authenticated')) ? $session->get('uid') : 0;
+
+               if (empty($remote) && ($local_user != $uid) && !empty($my_address = $session->get('my_address'))) {
+                       $remote = Contact::getIdForURL($my_address, $uid, false);
+               }
+
+               return $remote;
        }
 
        /**