Reworked fetching of contact data on "display" page

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index 69ab592afe276d8640c47f936857f1ffbcb9dba8..fadd1e94e563c42c66f3b6407b7c299fbf07e763 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -222,6 +222,13 @@ function notifications_content(&$a) {
 
                                $header .= " (".network_to_name($rr['gnetwork'], $rr['url']).")";
 
+                               // Don't show these data until you are connected. Diaspora is doing the same.
+                               if($rr['gnetwork'] === NETWORK_DIASPORA) {
+                                       $rr['glocation'] = "";
+                                       $rr['gabout'] = "";
+                                       $rr['ggender'] = "";
+                               }
+
                                $notif_content .= replace_macros($tpl, array(
                                        '$header' => htmlentities($header),
                                        '$str_notifytype' => t('Notification type: '),
@@ -235,7 +242,7 @@ function notifications_content(&$a) {
                                        '$fullname' => $rr['name'],
                                        '$location' => bbcode($rr['glocation'], false, false),
                                        '$location_label' => t('Location:'),
-                                       '$about' => proxy_parse_html(bbcode($rr['gabout'], false, false)),
+                                       '$about' => bbcode($rr['gabout'], false, false),
                                        '$about_label' => t('About:'),
                                        '$keywords' => $rr['gkeywords'],
                                        '$keywords_label' => t('Tags:'),
@@ -243,7 +250,8 @@ function notifications_content(&$a) {
                                        '$gender_label' => t('Gender:'),
                                        '$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' => $rr['url'],
+                                       '$zrl' => zrl($rr['url']),
                                        '$url_label' => t('Profile URL'),
                                        '$knowyou' => $knowyou,
                                        '$approve' => t('Approve'),