aboutsummaryrefslogtreecommitdiffstats
path: root/mod/profile.php
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-05-02 01:54:59 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-05-02 01:54:59 -0400
commitb3680c0d266f06d2474cb45750b0486d246a8315 (patch)
tree9b9f482f611b6dd91866518387b79140c6567be7 /mod/profile.php
parentc96b40ab5fff900cf6cbec6f16f1b3e88116fe96 (diff)
parentbecdb1f5085f2561b8b0acebbdbf43e4a81d50da (diff)
downloadvolse-hubzilla-b3680c0d266f06d2474cb45750b0486d246a8315.tar.gz
volse-hubzilla-b3680c0d266f06d2474cb45750b0486d246a8315.tar.bz2
volse-hubzilla-b3680c0d266f06d2474cb45750b0486d246a8315.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: final touches - show friends in common with total strangers from different sites fix size cross fingers reduce the scope a bit add template fn not found really fat fingers today - though none of this has gone further than my own site another one typo first try common friends for visitors * master:
Diffstat (limited to 'mod/profile.php')
-rw-r--r--mod/profile.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/mod/profile.php b/mod/profile.php
index e9d4ca344..69f044e89 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -143,6 +143,10 @@ function profile_content(&$a, $update = 0) {
return $o;
}
+
+ $o .= common_friends_visitor_widget($a->profile['profile_uid']);
+
+
if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner)
$o .= '<a href="newmember" id="newmember-tips" style="font-size: 1.2em;"><b>' . t('Tips for New Members') . '</b></a>' . EOL;