Merge pull request #6132 from annando/notice

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

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index b6a1e40a4e72c22dbd71dc39c520d84f4d158baf..c45bcdb84bd6fa75e6322386724cc5225310d8fa 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -297,7 +297,7 @@ class Profile
                $profile['picdate'] = urlencode(defaults($profile, 'picdate', ''));
 
                if (($profile['network'] != '') && ($profile['network'] != Protocol::DFRN)) {
-                       $profile['network_name'] = format_network_name($profile['network'], $profile['url']);
+                       $profile['network_name'] = Strings::formatNetworkName($profile['network'], $profile['url']);
                } else {
                        $profile['network_name'] = '';
                }
@@ -327,9 +327,9 @@ class Profile
                // Is the local user already connected to that user?
                if ($connect && local_user()) {
                        if (isset($profile['url'])) {
-                               $profile_url = normalise_link($profile['url']);
+                               $profile_url = Strings::normaliseLink($profile['url']);
                        } else {
-                               $profile_url = normalise_link(System::baseUrl() . '/profile/' . $profile['nickname']);
+                               $profile_url = Strings::normaliseLink(System::baseUrl() . '/profile/' . $profile['nickname']);
                        }
 
                        if (DBA::exists('contact', ['pending' => false, 'uid' => local_user(), 'nurl' => $profile_url])) {
@@ -371,7 +371,7 @@ class Profile
                                $r = q(
                                        "SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d",
                                        intval($profile['uid']),
-                                       DBA::escape(normalise_link(self::getMyURL())),
+                                       DBA::escape(Strings::normaliseLink(self::getMyURL())),
                                        intval(Contact::FRIEND)
                                );
                        }
@@ -882,7 +882,7 @@ class Profile
 
                $tab = false;
                if (x($_GET, 'tab')) {
-                       $tab = Strings::removeTags(trim($_GET['tab']));
+                       $tab = Strings::escapeTags(trim($_GET['tab']));
                }
 
                $url = System::baseUrl() . '/profile/' . $nickname;
@@ -1141,7 +1141,7 @@ class Profile
                }
                $achar = strpos($s, '?') ? '&' : '?';
                $mine = self::getMyURL();
-               if ($mine && !link_compare($mine, $s)) {
+               if ($mine && !Strings::compareLink($mine, $s)) {
                        return $s . $achar . 'zrl=' . urlencode($mine);
                }
                return $s;