aboutsummaryrefslogtreecommitdiffstats
path: root/mod/profile.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-06 00:00:46 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-06 00:00:46 +0200
commit34d268544e565985014ada4369e8673c87883a0a (patch)
tree49a30ed61668405d731df2e32b4548516ecb58b5 /mod/profile.php
parent81dfb61f930005f0f65b1f72935c10edc247a985 (diff)
parent9b6e91086b29554fd04362f6c87ea148718e8b1c (diff)
downloadvolse-hubzilla-34d268544e565985014ada4369e8673c87883a0a.tar.gz
volse-hubzilla-34d268544e565985014ada4369e8673c87883a0a.tar.bz2
volse-hubzilla-34d268544e565985014ada4369e8673c87883a0a.zip
Merge commit 'upstream/master'
Diffstat (limited to 'mod/profile.php')
-rwxr-xr-xmod/profile.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/mod/profile.php b/mod/profile.php
index 26b33d5f1..68d73fba3 100755
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -124,9 +124,9 @@ function profile_content(&$a, $update = 0) {
return;
}
- $a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
-
if(! $update) {
+
+
if(x($_GET,'tab'))
$tab = notags(trim($_GET['tab']));
@@ -148,6 +148,7 @@ function profile_content(&$a, $update = 0) {
$celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+ $a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
if(can_write_wall($a,$a->profile['profile_uid'])) {