X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=2c8452b1bffa45211b58b1c348ee518ec0ad926b;hb=55450087681f90ea7d517c301376c06aca18ccf1;hp=603707809be23219debd596fc93ef5d1d30ad763;hpb=d0ae5ce3263ec96250ecc1da0031f420891a370f;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index 603707809b..2c8452b1bf 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -64,16 +64,19 @@ function follow_content(&$a) {
 	$r = q("SELECT `location`, `about`, `keywords` FROM `gcontact` WHERE `nurl` = '%s'",
 		normalise_link($ret["url"]));
 
+	if (!$r)
+		$r = array(array("location" => "", "about" => "", "keywords" => ""));
+
 	$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"]),
 			'$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'))),
@@ -91,14 +94,15 @@ 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' => bbcode($r[0]["about"]),
+			'$about' => proxy_parse_html(bbcode($r[0]["about"], false, false)),
 			'$about_label' => t("About:"),
-			'$keywords' => bbcode($r[0]["keywords"]),
+			'$keywords' => $r[0]["keywords"],
 			'$keywords_label' => t("Tags:")
 	));
 	return $o;