more work on notification system, fix a couple of minor issues from smarty conversion

This commit is contained in:
friendica
2013-01-07 13:40:58 -08:00
parent 0001cc6fd3
commit f04ce3b093
10 changed files with 51 additions and 34 deletions

View File

@@ -25,8 +25,8 @@ function profile_init(&$a) {
);
if($x) {
$a->profile = $x[0];
$channel_display = get_pconfig($a->profile['profile_uid'],'system','channel_format');
if(! $channel_display)
// $channel_display = get_pconfig($a->profile['profile_uid'],'system','channel_format');
// if(! $channel_display)
profile_load($a,$which,$profile);
}
@@ -38,22 +38,7 @@ function profile_aside(&$a) {
require_once('include/contact_widgets.php');
require_once('include/items.php');
$x = q("select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
dbesc(argv(1))
);
if($x) {
$channel_display = get_pconfig($a->profile['profile_uid'],'system','channel_format');
if(! $channel_display)
profile_aside($a);
if($channel_display === 'full')
$a->page['template'] = 'full';
else {
$cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat']) : '');
$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));
}
}
profile_create_sidebar($a);
}