Fix fallback on unknown contact

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

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 99a299b57129b0092b90ea9e007b95dee9337c1e..f63d42c0ea58ae9a4252ad143b7775681ac0e065 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -714,15 +714,14 @@ class Contact extends BaseModule
                        $sql_values[] = $group;
                }
 
-               $sql_extra .= Widget::unavailableNetworks();
-
                $total = 0;
                $stmt = DBA::p("SELECT COUNT(*) AS `total`
                        FROM `contact`
                        WHERE `uid` = ?
                        AND `self` = 0
                        AND NOT `deleted`
-                       $sql_extra",
+                       $sql_extra
+                       " . Widget::unavailableNetworks(),
                        $sql_values
                );
                if (DBA::isResult($stmt)) {
@@ -972,7 +971,7 @@ class Contact extends BaseModule
                if (DBA::isResult($contact)) {
                        DI::page()['aside'] = '';
 
-                       $profiledata = Model\Contact::getDetailsByURL($contact['url']);
+                       $profiledata = Model\Contact::getByURL($contact['url'], false);
 
                        Model\Profile::load($a, '', $profiledata, true);
 
@@ -995,7 +994,7 @@ class Contact extends BaseModule
                if (DBA::isResult($contact)) {
                        DI::page()['aside'] = '';
 
-                       $profiledata = Model\Contact::getDetailsByURL($contact['url']);
+                       $profiledata = Model\Contact::getByURL($contact['url'], false);
 
                        if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) {
                                $profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);