aboutsummaryrefslogtreecommitdiffstats
path: root/include/menu.php
diff options
context:
space:
mode:
authormarijus <mario@localhost.localdomain>2014-02-06 08:49:17 +0100
committermarijus <mario@localhost.localdomain>2014-02-06 08:49:17 +0100
commitd1bd6cdb25108e78173f92b2e11d03b617653ac8 (patch)
tree1caccd16860b746e97c646bb2c41d859f1b25632 /include/menu.php
parentbd1849ddae165a85cb57377e9a35ea10b48fdddc (diff)
parent2c451d5c288d976b886338df4692249125dc8172 (diff)
downloadvolse-hubzilla-d1bd6cdb25108e78173f92b2e11d03b617653ac8.tar.gz
volse-hubzilla-d1bd6cdb25108e78173f92b2e11d03b617653ac8.tar.bz2
volse-hubzilla-d1bd6cdb25108e78173f92b2e11d03b617653ac8.zip
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/menu.php')
-rw-r--r--include/menu.php5
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'],