Merge pull request #1937 from annando/1510-follow-notifications

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index 7b1957c93be0728f5e6c3dee2beb95c5d1dc3276..2c8452b1bffa45211b58b1c348ee518ec0ad926b 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -72,11 +72,11 @@ function follow_content(&$a) {
        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"]),
                        '$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,6 +94,7 @@ function follow_content(&$a) {
                        '$nickname' => "",
                        '$name' => $ret["name"],
                        '$url' => $ret["url"],
+                       '$zrl' => zrl($ret["url"]),
                        '$url_label' => t("Profile URL"),
                        '$myaddr' => $myaddr,
                        '$request' => $request,