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

1 files changed, 3 insertions, 18 deletions

diff --git a/mod/profile.php b/mod/profile.php
index 8f15766b6..2f869a533 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -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);
 
 }