Fixing double encoding here as well

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

diff --git a/src/Model/User.php b/src/Model/User.php
index 40b6c4ff15e0da18f4e181b49963716278c562d1..a6a9fc95253efb6d64abd2eb4a30bf08ca1788dd 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -98,6 +98,19 @@ class User
                if (!DBA::isResult($r)) {
                        return false;
                }
+
+               if (empty($r['nickname'])) {
+                       return false;
+               }
+
+               // Check if the returned data is valid, otherwise fix it. See issue #6122
+               $url = System::baseUrl() . '/profile/' . $r['nickname'];
+               $addr = $r['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+
+               if (($addr != $r['addr']) || ($r['url'] != $url) || ($r['nurl'] != Strings::normaliseLink($r['url']))) {
+                       Contact::updateSelfFromUserID($uid);
+               }
+
                return $r;
        }