transfer some stuff from "follow" to the "notifications" to reduce the differences...

diff --git a/mod/follow.php b/mod/follow.php
index b635b3493bb24dc5c45e1249b6ea8c5f4f0c2fc8..7b1957c93be0728f5e6c3dee2beb95c5d1dc3276 100644 (file)
--- 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 1fc31c3eb97d81de3fa30c4a74dced2b0397f1e5..831beee765d4c4c6105a7ce90caad2fb6f69c516 100644 (file)
--- 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 aa10cde48fea4fb2cb7bb255a6baab29836d37f5..d50b14cd41041afe4643e8bacacac552bd8ffec0 100644 (file)
--- 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}}