Merge pull request #1979 from annando/1510-gnusocial

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index 7b1957c93be0728f5e6c3dee2beb95c5d1dc3276..54c20e5093ac4924f7891b4dd37a54785c14cc3f 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -67,16 +67,21 @@ function follow_content(&$a) {
        if (!$r)
                $r = array(array("location" => "", "about" => "", "keywords" => ""));
 
+       if($ret['network'] === NETWORK_DIASPORA) {
+               $r[0]["location"] = "";
+               $r[0]["about"] = "";
+       }
+
        $header = $ret["name"];
 
        if ($ret["addr"] != "")
                $header .= " <".$ret["addr"].">";
 
-       $header .= " (".network_to_name($ret['network']).")";
+       $header .= " (".network_to_name($ret['network'], $ret['url']).")";
 
        $o  = replace_macros($tpl,array(
                        '$header' => htmlentities($header),
-                       '$photo' => $ret["photo"],
+                       '$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL),
                        '$desc' => "",
                        '$pls_answer' => t('Please answer the following:'),
                        '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'),t('Yes'))),
@@ -94,12 +99,13 @@ function follow_content(&$a) {
                        '$nickname' => "",
                        '$name' => $ret["name"],
                        '$url' => $ret["url"],
+                       '$zrl' => zrl($ret["url"]),
                        '$url_label' => t("Profile URL"),
                        '$myaddr' => $myaddr,
                        '$request' => $request,
                        '$location' => bbcode($r[0]["location"]),
                        '$location_label' => t("Location:"),
-                       '$about' => proxy_parse_html(bbcode($r[0]["about"], false, false)),
+                       '$about' => bbcode($r[0]["about"], false, false),
                        '$about_label' => t("About:"),
                        '$keywords' => $r[0]["keywords"],
                        '$keywords_label' => t("Tags:")