Fixing double encoding here as well

[friendica.git] / src / Content / ContactSelector.php

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 298f2512edf349f5089556f9dfcc1dadc7e9c7ff..5ba6528ed0561b6ebd1bc70759dcbcf4dcb6d3ab 100644 (file)
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -10,6 +10,7 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 /**
  * @brief ContactSelector class
@@ -77,7 +78,7 @@ class ContactSelector
        public static function networkToName($network, $profile = "")
        {
                $nets = [
-                       Protocol::DFRN      =>   L10n::t('Friendica'),
+                       Protocol::DFRN      =>   L10n::t('DFRN'),
                        Protocol::OSTATUS   =>   L10n::t('OStatus'),
                        Protocol::FEED      =>   L10n::t('RSS/Atom'),
                        Protocol::MAIL      =>   L10n::t('Email'),
@@ -106,12 +107,12 @@ class ContactSelector
                        // Create the server url out of the profile url
                        $parts = parse_url($profile);
                        unset($parts['path']);
-                       $server_url = [normalise_link(Network::unparseURL($parts))];
+                       $server_url = [Strings::normaliseLink(Network::unparseURL($parts))];
 
                        // Fetch the server url
-                       $gcontact = DBA::selectFirst('gcontact', ['server_url'], ['nurl' => normalise_link($profile)]);
+                       $gcontact = DBA::selectFirst('gcontact', ['server_url'], ['nurl' => Strings::normaliseLink($profile)]);
                        if (!empty($gcontact) && !empty($gcontact['server_url'])) {
-                               $server_url[] = normalise_link($gcontact['server_url']);
+                               $server_url[] = Strings::normaliseLink($gcontact['server_url']);
                        }
 
                        // Now query the GServer for the platform name