diff options
| author | Mario <mario@mariovavti.com> | 2018-06-17 17:00:17 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-06-17 17:00:17 +0200 |
| commit | 28043726e64f750e646b42aa6f649e277fc3767e (patch) | |
| tree | 18a41bea6a4805454e0b1a2dacdfeda451854690 /include/menu.php | |
| parent | 9c5df51141d68e50d3c1f5d3097160408debce48 (diff) | |
| parent | 7e736c5359732647f5203bf2bb7fcd50c448fad9 (diff) | |
| download | volse-hubzilla-28043726e64f750e646b42aa6f649e277fc3767e.tar.gz volse-hubzilla-28043726e64f750e646b42aa6f649e277fc3767e.tar.bz2 volse-hubzilla-28043726e64f750e646b42aa6f649e277fc3767e.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core 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'], |