diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-01-03 09:17:11 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-01-03 09:17:11 +0000 |
| commit | b1a02cf450c92e88f3375d15b153d0046bc5c724 (patch) | |
| tree | a3c4db0f0dd1f9b0bde31ec1f78117d9acb19907 /mod/profile.php | |
| parent | 577236c372b4eaa1e93d60d7bedaecea8ef8c97f (diff) | |
| parent | 1e7a5560f5a5887641d120e77f0f9993bf3b58b9 (diff) | |
| download | volse-hubzilla-b1a02cf450c92e88f3375d15b153d0046bc5c724.tar.gz volse-hubzilla-b1a02cf450c92e88f3375d15b153d0046bc5c724.tar.bz2 volse-hubzilla-b1a02cf450c92e88f3375d15b153d0046bc5c724.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/profile.php')
| -rw-r--r-- | mod/profile.php | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/mod/profile.php b/mod/profile.php index 68cc53f56..1865d69fc 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -28,11 +28,22 @@ function profile_aside(&$a) { $profile = argv(1); } - profile_load($a,$which,$profile); - - $a->set_widget('archive',posted_date_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$a->profile['profile_uid'],true)); - $a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$cat)); + $x = q("select uid as profile_uid from channel where address = '%s' limit 1", + dbesc(argv(1)) + ); + if($x) { + $a->profile = $x[0]; + $channel_display = get_pconfig($a->profile['profile_uid'],'system','channel_format'); + if(! $channel_display) + profile_load($a,$which,$profile); + if($channel_display === 'full') + $a->page['template'] = 'full'; + else { + $a->set_widget('archive',posted_date_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$a->profile['profile_uid'],true)); + $a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/channel/' . $a->profile['nickname'],$cat)); + } + } } |