diff options
| author | zotlabs <mike@macgirvin.com> | 2018-06-10 22:16:39 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-06-10 22:16:39 -0700 |
| commit | a8f179145bf572e1a9dc78e53bd68910029c2ac0 (patch) | |
| tree | ea6f1e3b696d96b45772025b6ce5b372fe9ab0b5 /include/menu.php | |
| parent | 1b9a350469a51789d6ed1ceaaaf4a0d1c3406872 (diff) | |
| parent | 912ccb31a133c09b28890f0bab5be5ce1f7f95d4 (diff) | |
| download | volse-hubzilla-a8f179145bf572e1a9dc78e53bd68910029c2ac0.tar.gz volse-hubzilla-a8f179145bf572e1a9dc78e53bd68910029c2ac0.tar.bz2 volse-hubzilla-a8f179145bf572e1a9dc78e53bd68910029c2ac0.zip | |
Merge branch 'master' of ../hz into dev
Diffstat (limited to 'include/menu.php')
| -rw-r--r-- | include/menu.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/menu.php b/include/menu.php index 4add78c39..1a2059451 100644 --- a/include/menu.php +++ b/include/menu.php @@ -81,6 +81,10 @@ function menu_render($menu, $class='', $edit = false, $var = array()) { if ((! $channel_id) && (local_channel())) $channel_id = local_channel(); + $chan = channelx_by_n($channel_id); + if(! $chan) + return ''; + $menu_list = menu_list($channel_id); $menu_names = array(); @@ -110,6 +114,7 @@ function menu_render($menu, $class='', $edit = false, $var = array()) { $ret = replace_macros(get_markup_template('usermenu.tpl'),array( '$menu' => $menu['menu'], '$class' => $class, + '$nick' => $chan['channel_address'], '$edit' => (($edit) ? t("Edit") : ''), '$id' => $menu['menu']['menu_id'], '$items' => $menu['items'], |