From 9abd95fad3784a10fc48bc40f9b8a75d7d74edda Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 31 Mar 2016 16:06:03 -0700 Subject: static App --- include/menu.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/menu.php') diff --git a/include/menu.php b/include/menu.php index d90cefddb..ca3038946 100644 --- a/include/menu.php +++ b/include/menu.php @@ -72,7 +72,7 @@ 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); + $channel_id = ((is_array(App::$profile)) ? App::$profile['profile_uid'] : 0); if ((! $channel_id) && (local_channel())) $channel_id = local_channel(); @@ -296,7 +296,7 @@ function menu_add_item($menu_id, $uid, $arr) { $mitem_flags = intval($arr['mitem_flags']); if(local_channel() == $uid) { - $channel = get_app()->get_channel(); + $channel = App::get_channel(); } $acl = new Zotlabs\Access\AccessList($channel); @@ -337,7 +337,7 @@ function menu_edit_item($menu_id, $uid, $arr) { if(local_channel() == $uid) { - $channel = get_app()->get_channel(); + $channel = App::get_channel(); } $acl = new Zotlabs\Access\AccessList($channel); -- cgit v1.2.3 From 36b388ab8cb8435dc621b5c589e9f6555593568f Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 31 Mar 2016 18:53:05 -0700 Subject: issue #336 --- include/menu.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/menu.php') diff --git a/include/menu.php b/include/menu.php index ca3038946..e8f1d8eb8 100644 --- a/include/menu.php +++ b/include/menu.php @@ -35,11 +35,11 @@ function menu_element($menu) { $arr['edited'] = $menu['menu']['menu_edited']; $arr['baseurl'] = z_root(); - if($menu['menu_flags']) { + if($menu['menu']['menu_flags']) { $arr['flags'] = array(); - if($menu['menu_flags'] & MENU_BOOKMARK) + if($menu['menu']['menu_flags'] & MENU_BOOKMARK) $arr['flags'][] = 'bookmark'; - if($menu['menu_flags'] & MENU_SYSTEM) + if($menu['menu']['menu_flags'] & MENU_SYSTEM) $arr['flags'][] = 'system'; } if($menu['items']) { -- cgit v1.2.3