Ensure that the network is set for "self" contac ts

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index a45145d9cbb003e9a95d934f5e9e781b9a75fbda..c18c678eb992be2a204cdf56359d749caa216e1c 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -630,7 +630,7 @@ class Contact
        {
                $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey',
                        'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
-                       'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco'];
+                       'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco', 'network'];
                $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
                if (!DBA::isResult($self)) {
                        return false;
@@ -655,7 +655,7 @@ class Contact
                        'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile),
                        'about' => $profile['about'], 'keywords' => $profile['pub_keywords'],
                        'contact-type' => $user['account-type'], 'prvkey' => $user['prvkey'],
-                       'pubkey' => $user['pubkey'], 'xmpp' => $profile['xmpp']];
+                       'pubkey' => $user['pubkey'], 'xmpp' => $profile['xmpp'], 'network' => Protocol::DFRN];
 
                // it seems as if ported accounts can have wrong values, so we make sure that now everything is fine.
                $fields['url'] = DI::baseUrl() . '/profile/' . $user['nickname'];

diff --git a/src/Model/User.php b/src/Model/User.php
index 14f40662b2ea162dcf36689cb579cd731e9ae17b..bc3536acf16e3cc6e30403b766d548fc4ff7de00 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -412,7 +412,7 @@ class User
 
                // Check for correct url and normalised nurl
                $url = DI::baseUrl() . '/profile/' . $owner['nickname'];
-               $repair = ($owner['url'] != $url) || ($owner['nurl'] != Strings::normaliseLink($owner['url']));
+               $repair = empty($owner['network']) || ($owner['url'] != $url) || ($owner['nurl'] != Strings::normaliseLink($owner['url']));
 
                if (!$repair) {
                        // Check if "addr" is present and correct