Raw content is now stored with announce messages as well

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

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index c5c2cb36648c8146caa1e65a5865d81233cc6a3e..867a6db4fb6fad2f31ea1a41d65c6a7b9cb8f07d 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -27,6 +27,7 @@ use Friendica\Content\Widget\ContactBlock;
 use Friendica\Core\Cache\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
+use Friendica\Network\Probe;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -329,7 +330,8 @@ class Profile
 
                if (!$local_user_is_self && $show_connect) {
                        if (!$visitor_is_authenticated) {
-                               if (!empty($profile['nickname'])) {
+                               // Remote follow is only available for local profiles
+                               if (!empty($profile['nickname']) && strpos($profile_url, DI::baseUrl()->get()) === 0) {
                                        $follow_link = 'remote_follow/' . $profile['nickname'];
                                }
                        } elseif ($profile_is_native) {
@@ -376,13 +378,12 @@ class Profile
                        $location = DI::l10n()->t('Location:');
                }
 
-               $gender   = !empty($profile['gender'])   ? DI::l10n()->t('Gender:')   : false;
                $homepage = !empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false;
                $about    = !empty($profile['about'])    ? DI::l10n()->t('About:')    : false;
                $xmpp     = !empty($profile['xmpp'])     ? DI::l10n()->t('XMPP:')     : false;
 
                if ((!empty($profile['hidewall']) || $block) && !Session::isAuthenticated()) {
-                       $location = $gender = $marital = $homepage = $about = false;
+                       $location = $homepage = $about = false;
                }
 
                $split_name = Diaspora::splitName($profile['name']);
@@ -393,7 +394,7 @@ class Profile
                        $diaspora = [
                                'guid' => $profile['guid'],
                                'podloc' => DI::baseUrl(),
-                               'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false'),
+                               'searchable' => ($profile['net-publish'] ? 'true' : 'false'),
                                'nickname' => $profile['nickname'],
                                'fullname' => $profile['name'],
                                'firstname' => $firstname,
@@ -451,10 +452,6 @@ class Profile
                        $p['address'] = BBCode::convert($p['address']);
                }
 
-               if (isset($p['gender'])) {
-                       $p['gender'] = DI::l10n()->t($p['gender']);
-               }
-
                if (isset($p['photo'])) {
                        $p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL);
                }
@@ -475,7 +472,6 @@ class Profile
                        '$wallmessage_link' => $wallmessage_link,
                        '$account_type' => $account_type,
                        '$location' => $location,
-                       '$gender' => $gender,
                        '$homepage' => $homepage,
                        '$about' => $about,
                        '$network' => DI::l10n()->t('Network:'),
@@ -791,6 +787,7 @@ class Profile
                $_SESSION['visitor_handle'] = $visitor['addr'];
                $_SESSION['visitor_home'] = $visitor['url'];
                $_SESSION['my_url'] = $visitor['url'];
+               $_SESSION['remote_comment'] = Probe::getRemoteFollowLink($visitor['url']);
 
                Session::setVisitorsContacts();