aboutsummaryrefslogtreecommitdiffstats
path: root/mod/profile.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-02 22:00:22 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-02 22:00:22 +0200
commit3dc317dcc62c8e982d964bcae421a1410771d51c (patch)
tree6e63f4e263a6637656ed24dfb5c36292d442c268 /mod/profile.php
parenta39d8d3f02e5bbd711fde71594c2c787b21ef2e9 (diff)
parent6dfd55668f39d2cfb27d468cc982471abaad5165 (diff)
downloadvolse-hubzilla-3dc317dcc62c8e982d964bcae421a1410771d51c.tar.gz
volse-hubzilla-3dc317dcc62c8e982d964bcae421a1410771d51c.tar.bz2
volse-hubzilla-3dc317dcc62c8e982d964bcae421a1410771d51c.zip
Merge commit 'upstream/master'
Diffstat (limited to 'mod/profile.php')
-rwxr-xr-xmod/profile.php21
1 files changed, 20 insertions, 1 deletions
diff --git a/mod/profile.php b/mod/profile.php
index 782d17d83..26b33d5f1 100755
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -2,6 +2,11 @@
function profile_init(&$a) {
+ require_once('include/contact_widgets.php');
+
+ if(! x($a->page,'aside'))
+ $a->page['aside'] = '';
+
$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
if($a->argc > 1)
@@ -59,6 +64,13 @@ function profile_init(&$a) {
function profile_content(&$a, $update = 0) {
+ if (x($a->category)) {
+ $category = $a->category;
+ }
+ else {
+ $category = ((x($_GET,'category')) ? $_GET['category'] : '');
+ }
+
if(get_config('system','block_public') && (! local_user()) && (! remote_user())) {
return login();
}
@@ -112,7 +124,8 @@ 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']));
@@ -135,6 +148,7 @@ function profile_content(&$a, $update = 0) {
$celeb = ((($a->profile['page-flags'] == PAGE_SOAPBOX) || ($a->profile['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+
if(can_write_wall($a,$a->profile['profile_uid'])) {
$x = array(
@@ -178,6 +192,10 @@ function profile_content(&$a, $update = 0) {
}
else {
+ if(x($category)) {
+ $sql_extra .= file_tag_file_query('item',$category,'category');
+ }
+
$r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@@ -204,6 +222,7 @@ function profile_content(&$a, $update = 0) {
intval($a->profile['profile_uid'])
);
+
}
$parents_arr = array();