Merge pull request #161 from zzottel/master

Add possibility to use a block in a channel menu (set channel_menublock to ...

2 files changed, 6 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index 8e3a98454..3b98afeb6 100755
--- a/boot.php
+++ b/boot.php
@@ -1783,6 +1783,11 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
 		if($m)
 			$channel_menu = menu_render($m);
 	}
+	$menublock = get_pconfig($profile['uid'],'system','channel_menublock');
+	if ($menublock) {
+		require_once('include/comanche.php');
+		$channel_menu .= comanche_block($menublock);
+	}
 
 	$tpl = get_markup_template('profile_vcard.tpl');
 
diff --git a/include/comanche.php b/include/comanche.php
index 526819572..f1dd0e521 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -87,7 +87,7 @@ function comanche_replace_region($match) {
 function comanche_block($name) {
 	
 	$o = '';
-	$r = q("select * from item left join item_id on iid = item_id and item_id.uid = item.uid and item.uid = %d and service = 'BUILDBLOCK' and sid = '%s' limit 1",
+	$r = q("select * from item inner join item_id on iid = item.id and item_id.uid = item.uid and item.uid = %d and service = 'BUILDBLOCK' and sid = '%s' limit 1",
 		intval(get_app()->profile['profile_uid']),
 		dbesc($name)
 	);