Merge pull request #9079 from annando/replace

Added support for the "replace" database command

diff --git a/mod/follow.php b/mod/follow.php
index ac07d040cc99afb11d9afcbe9747fa91de507c16..885730f07c511e995829476671c986a5f032f7e0 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -108,7 +108,13 @@ function follow_content(App $a)
        }
 
        $contact = Contact::getByURL($url, true);
+
+       // Possibly it is a mail contact
        if (empty($contact)) {
+               $contact = Probe::uri($url, Protocol::MAIL, $uid);
+       }
+
+       if (empty($contact) || ($contact['network'] == Protocol::PHANTOM)) {
                // Possibly it is a remote item and not an account
                follow_remote_item($url);