aboutsummaryrefslogtreecommitdiffstats
path: root/mod/profile.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-16 15:30:51 +0200
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-16 15:30:51 +0200
commitbca1dcf2d6e243ca803e590168305ed5a232d923 (patch)
tree7e2e8b5ac3fd8734fc53f1cb22a81169860e6059 /mod/profile.php
parentae3c9b7b2b6f6b8bf7a5d5e72bd66f1bff3b081d (diff)
parentc92e6ed929ddb12a3020eecf419a30b680fe4240 (diff)
downloadvolse-hubzilla-bca1dcf2d6e243ca803e590168305ed5a232d923.tar.gz
volse-hubzilla-bca1dcf2d6e243ca803e590168305ed5a232d923.tar.bz2
volse-hubzilla-bca1dcf2d6e243ca803e590168305ed5a232d923.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/profile.php')
-rw-r--r--mod/profile.php3
1 files changed, 0 insertions, 3 deletions
diff --git a/mod/profile.php b/mod/profile.php
index aeb21f077..587ac6288 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -261,11 +261,8 @@ function profile_content(&$a, $update = 0) {
if($is_owner && ! $update)
$o .= get_birthdays();
-
-
$o .= conversation($a,$r,'profile',$update);
-
if(! $update) {
$o .= paginate($a);