diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-05-29 13:08:01 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-05-29 13:08:01 +0200 |
| commit | b8d328076384ff48be47f59366aea8b1e1cc04a1 (patch) | |
| tree | 81f0c9ac22a7ca48bf6aa6ccde8c738d5620caa3 /include | |
| parent | 5f1ae2930b5ae69e142aed84f70afe5cde8cc38f (diff) | |
| download | volse-hubzilla-b8d328076384ff48be47f59366aea8b1e1cc04a1.tar.gz volse-hubzilla-b8d328076384ff48be47f59366aea8b1e1cc04a1.tar.bz2 volse-hubzilla-b8d328076384ff48be47f59366aea8b1e1cc04a1.zip | |
some fixes to make menu sharing work and expose it in the ui.
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 3 | ||||
| -rw-r--r-- | include/menu.php | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 1f5a65399..a766b6aea 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; diff --git a/include/menu.php b/include/menu.php index 5c078c189..ae53945ef 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']) { @@ -124,7 +124,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 +286,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']); |