diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-06 14:56:59 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-06 14:56:59 +0100 |
| commit | a2b311991a90e1c78d30bad5504c18bb2a3c5c2a (patch) | |
| tree | 54b5e5dbc7230442a3e1ec894c4a4c385b2d78c7 /include/menu.php | |
| parent | 419e3b5024efec40c98e48c3bf213c4e60d39fae (diff) | |
| parent | 7a522be20bd66a0a904dcddf33d53e59aa04a92d (diff) | |
| download | volse-hubzilla-a2b311991a90e1c78d30bad5504c18bb2a3c5c2a.tar.gz volse-hubzilla-a2b311991a90e1c78d30bad5504c18bb2a3c5c2a.tar.bz2 volse-hubzilla-a2b311991a90e1c78d30bad5504c18bb2a3c5c2a.zip | |
Merge branch 'master' of https://github.com/friendica/red into upstream
Diffstat (limited to 'include/menu.php')
| -rw-r--r-- | include/menu.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/menu.php b/include/menu.php index 105e4216b..813d7bcdb 100644 --- a/include/menu.php +++ b/include/menu.php @@ -1,6 +1,7 @@ <?php /** @file */ require_once('include/security.php'); +require_once('include/bbcode.php'); function menu_fetch($name,$uid,$observer_xchan) { @@ -27,11 +28,13 @@ function menu_render($menu) { if(! $menu) return ''; - for($x = 0; $x < count($menu['items']); $x ++) + for($x = 0; $x < count($menu['items']); $x ++) { if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_ZID) $menu['items'][$x]['mitem_link'] = zid($menu['items'][$x]['mitem_link']); if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_NEWWIN) $menu['items'][$x]['newwin'] = '1'; + $menu['items'][$x]['mitem_desc'] = bbcode($menu['items'][$x]['mitem_desc']); + } return replace_macros(get_markup_template('usermenu.tpl'),array( '$menu' => $menu['menu'], |