diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-30 15:04:11 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-30 15:04:11 -0700 |
| commit | cd3284d081bc86d0646234b490bc0cc9da60c638 (patch) | |
| tree | db7189c60b1bd4d8a484f491b736859086085564 /include | |
| parent | edd228decb5ef4c3ffa2a8be00983937680a56c2 (diff) | |
| parent | 504050618497d3f3f43bb44b89637ebd767557ce (diff) | |
| download | volse-hubzilla-cd3284d081bc86d0646234b490bc0cc9da60c638.tar.gz volse-hubzilla-cd3284d081bc86d0646234b490bc0cc9da60c638.tar.bz2 volse-hubzilla-cd3284d081bc86d0646234b490bc0cc9da60c638.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 5 | ||||
| -rw-r--r-- | include/menu.php | 18 |
2 files changed, 14 insertions, 9 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 9ec5ce22f..f4d9bb525 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -193,6 +193,9 @@ function translate_design_element($type) { case 'block': $ret = t('block'); break; + case 'menu': + $ret = t('menu'); + break; } return $ret; @@ -958,4 +961,4 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true) { function strip_bbimage($s) { $Text = preg_replace("/\[[zi]mg(.*?)\](.*?)\[\/[zi]mg\]/ism", '', $Text); -}
\ No newline at end of file +} diff --git a/include/menu.php b/include/menu.php index 5c078c189..d20df1d6e 100644 --- a/include/menu.php +++ b/include/menu.php @@ -28,10 +28,10 @@ function menu_element($menu) { $arr = array(); $arr['type'] = 'menu'; - $arr['name'] = $menu['menu_name']; - $arr['desc'] = $menu['menu_desc']; - $arr['created'] = $menu['menu_created']; - $arr['edited'] = $menu['menu_edited']; + $arr['pagetitle'] = $menu['menu']['menu_name']; + $arr['desc'] = $menu['menu']['menu_desc']; + $arr['created'] = $menu['menu']['menu_created']; + $arr['edited'] = $menu['menu']['menu_edited']; $arr['baseurl'] = z_root(); if($menu['menu_flags']) { @@ -66,13 +66,17 @@ function menu_element($menu) { -function menu_render($menu, $class='', $edit = false, $var = '') { +function menu_render($menu, $class='', $edit = false, $var = array()) { if(! $menu) return ''; $channel_id = ((is_array(get_app()->profile)) ? get_app()->profile['profile_uid'] : 0); + if ((! $channel_id) && (local_channel())) + $channel_id = local_channel(); + $menu_list = menu_list($channel_id); + $menu_names = array(); foreach($menu_list as $menus) { if($menus['menu_name'] != $menu['menu']['menu_name']) @@ -82,7 +86,7 @@ function menu_render($menu, $class='', $edit = false, $var = '') { for($x = 0; $x < count($menu['items']); $x ++) { if(in_array($menu['items'][$x]['mitem_link'], $menu_names)) { $m = menu_fetch($menu['items'][$x]['mitem_link'], $channel_id, get_observer_hash()); - $submenu = menu_render($m, 'dropdown-menu', $edit = false, $var = array('wrap' => 'none')); + $submenu = menu_render($m, 'dropdown-menu', $edit = false, array('wrap' => 'none')); $menu['items'][$x]['submenu'] = $submenu; } @@ -124,7 +128,6 @@ function menu_fetch_id($menu_id,$channel_id) { function menu_create($arr) { - $menu_name = trim(escape_tags($arr['menu_name'])); $menu_desc = trim(escape_tags($arr['menu_desc'])); $menu_flags = intval($arr['menu_flags']); @@ -287,7 +290,6 @@ function menu_delete_id($menu_id, $uid) { function menu_add_item($menu_id, $uid, $arr) { - $mitem_link = escape_tags($arr['mitem_link']); $mitem_desc = escape_tags($arr['mitem_desc']); $mitem_order = intval($arr['mitem_order']); |