Experimental alternate channel_menu navigation. To use, "util/config system.channel_menu 1"

include/channel.php

@@ -1373,7 +1373,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 		? trim(substr($profile['channel_name'],0,strpos($profile['channel_name'],' '))) : $profile['channel_name']);
 	$lastname = (($firstname === $profile['channel_name']) ? '' : trim(substr($profile['channel_name'],strlen($firstname))));
 
-	// @fixme move this to the diaspora plugin itself
 
 	$contact_block = contact_block();
 

include/nav.php

@@ -280,6 +280,8 @@ EOT;
 		'$help' => t('@name, #tag, ?doc, content'),
 		'$pleasewait' => t('Please wait...'),
 		'$nav_apps' => $nav_apps,
+		'$channel_menu' => get_config('system','channel_menu'),
+		'$channel_thumb' => ((App::$profile) ? App::$profile['thumb'] : ''),
 		'$channel_apps' => $channel_apps,
 		'$addapps' => t('Add Apps'),
 		'$orderapps' => t('Arrange Apps'),
@@ -481,7 +483,8 @@ function channel_apps($is_owner = false, $nickname = null) {
 		[
 			'$tabs'  => $arr['tabs'],
 			'$name'  => App::$profile['channel_name'],
-			'$thumb' => App::$profile['thumb']
+			'$thumb' => App::$profile['thumb'],
+			'$channel_menu' => get_config('system','channel_menu')
 		]
 	);
 }