aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-10-01 00:56:13 -0700
committerfriendica <info@friendica.com>2013-10-01 00:56:13 -0700
commit82b835a18b34d98c77062cbf668548e18d23b624 (patch)
treeeffbe0a5c2507760ae065d9c786c91e1c070cac0 /boot.php
parenta6c542289acd349baea37dff0fe7f37427964b15 (diff)
parentd7b81b1afd150ebc0abfcd12f6ab23d65b61a0af (diff)
downloadvolse-hubzilla-82b835a18b34d98c77062cbf668548e18d23b624.tar.gz
volse-hubzilla-82b835a18b34d98c77062cbf668548e18d23b624.tar.bz2
volse-hubzilla-82b835a18b34d98c77062cbf668548e18d23b624.zip
Merge pull request #161 from zzottel/master
Add possibility to use a block in a channel menu (set channel_menublock to ...
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php5
1 files changed, 5 insertions, 0 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');