Merge pull request #9334 from annando/endless-scroll

[friendica.git/.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index a6bdb04..878f683 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2578,7 +2578,7 @@ class Contact
        {
                $destination = $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
 
-               if (!Session::isAuthenticated() || ($contact['network'] != Protocol::DFRN)) {
+               if (!Session::isAuthenticated()) {
                        return $destination;
                }
 
@@ -2587,6 +2587,14 @@ class Contact
                        return $url;
                }
 
+               if (DI::pConfig()->get(local_user(), 'system', 'stay_local') && ($url == '')) {
+                       return 'contact/' . $contact['id'] . '/conversations';
+               }
+
+               if ($contact['network'] != Protocol::DFRN) {
+                       return $destination;
+               }
+
                if (!empty($contact['uid'])) {
                        return self::magicLink($contact['url'], $url);
                }