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 f08c68ed0829f2de24643ddcbffc2f8b0e1b98e7..c4fbb3f8c6d043b9764a0ef2623c64a92e2752d9 100644 (file)
--- a/src/Core/Session.php
+++ b/src/Core/Session.php
@@ -65,20 +65,28 @@ class Session
        }
 
        /**
-        * Returns contact ID for given user ID
+        * Return the user contact ID of a visitor for the given user ID they are visiting
         *
         * @param integer $uid User ID
-        * @return integer Contact ID of visitor for given user ID
+        * @return integer
         */
        public static function getRemoteContactID($uid)
        {
                $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;
        }
 
        /**
@@ -111,7 +119,7 @@ class Session
 
                $remote_contacts = DBA::select('contact', ['id', 'uid'], ['nurl' => Strings::normaliseLink($session->get('my_url')), 'rel' => [Contact::FOLLOWER, Contact::FRIEND], 'self' => false]);
                while ($contact = DBA::fetch($remote_contacts)) {
-                       if (($contact['uid'] == 0) || Contact::isBlockedByUser($contact['id'], $contact['uid'])) {
+                       if (($contact['uid'] == 0) || Contact\User::isBlocked($contact['id'], $contact['uid'])) {
                                continue;
                        }