From: Michael Vogel <icarus@dabo.de>
Date: Sun, 4 Oct 2015 13:55:24 +0000 (+0200)
Subject: transfer some stuff from "follow" to the "notifications" to reduce the differences... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=83ea4f72538bb4cd2e79979307744933010a2082;p=friendica.git

transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues.
---

diff --git a/mod/follow.php b/mod/follow.php
index b635b3493b..7b1957c93b 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -99,9 +99,9 @@ function follow_content(&$a) {
 			'$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;
diff --git a/mod/notifications.php b/mod/notifications.php
index 1fc31c3eb9..831beee765 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -216,7 +216,7 @@ function notifications_content(&$a) {
 					'$contact_id' => $rr['contact-id'],
 					'$photo' => ((x($rr,'photo')) ? proxy_url($rr['photo']) : "images/person-175.jpg"),
 					'$fullname' => $rr['name'],
-					'$location' => $rr['glocation'],
+					'$location' => bbcode($rr['glocation'], false, false),
 					'$location_label' => t('Location:'),
 					'$about' => proxy_parse_html(bbcode($rr['gabout'], false, false)),
 					'$about_label' => t('About:'),
@@ -227,6 +227,7 @@ function notifications_content(&$a) {
 					'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
 					'$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
 					'$url' => zrl($rr['url']),
+					'$url_label' => t('Profile URL'),
 					'$knowyou' => $knowyou,
 					'$approve' => t('Approve'),
 					'$note' => $rr['note'],
diff --git a/view/templates/intros.tpl b/view/templates/intros.tpl
index aa10cde48f..d50b14cd41 100644
--- a/view/templates/intros.tpl
+++ b/view/templates/intros.tpl
@@ -5,6 +5,7 @@
 <p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
 <a class="intro-url-link" id="intro-url-link-{{$contact_id}}" href="{{$url}}" ><div class="intro-fullname" id="intro-fullname-{{$contact_id}}" >{{$fullname}}</div></a>
 <img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" />
+<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$url}}">{{$url}}</a></dd></dl>
 {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
 {{if $gender}}<dl><dt>{{$gender_label}}</dt><dd>{{$gender}}</dd></dl>{{/if}}
 {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}