mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-21 02:35:19 +00:00
Merge pull request #161 from zzottel/master
Add possibility to use a block in a channel menu (set channel_menublock to ...
This commit is contained in:
commit
82b835a18b
2 changed files with 6 additions and 1 deletions
5
boot.php
5
boot.php
|
@ -1783,6 +1783,11 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
|
||||||
if($m)
|
if($m)
|
||||||
$channel_menu = menu_render($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');
|
$tpl = get_markup_template('profile_vcard.tpl');
|
||||||
|
|
||||||
|
|
|
@ -87,7 +87,7 @@ function comanche_replace_region($match) {
|
||||||
function comanche_block($name) {
|
function comanche_block($name) {
|
||||||
|
|
||||||
$o = '';
|
$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']),
|
intval(get_app()->profile['profile_uid']),
|
||||||
dbesc($name)
|
dbesc($name)
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue