diff options
| author | redmatrix <git@macgirvin.com> | 2016-08-22 20:05:25 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-08-22 20:05:25 -0700 |
| commit | b89c869e7ce2586852607a55717f5388c88e275d (patch) | |
| tree | d76c0c76e348d92d392c2e1f25b12a7abeba51f4 /Zotlabs/Module/Menu.php | |
| parent | fbb357ac47f0c5823dd30aa9b955982035cef8ba (diff) | |
| parent | 1a506ad49cdec5cd69c3081b15a3557b16a45a7e (diff) | |
| download | volse-hubzilla-b89c869e7ce2586852607a55717f5388c88e275d.tar.gz volse-hubzilla-b89c869e7ce2586852607a55717f5388c88e275d.tar.bz2 volse-hubzilla-b89c869e7ce2586852607a55717f5388c88e275d.zip | |
Merge branch '1.12RC'
Diffstat (limited to 'Zotlabs/Module/Menu.php')
| -rw-r--r-- | Zotlabs/Module/Menu.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Menu.php b/Zotlabs/Module/Menu.php index e98053f8c..1dec65c1f 100644 --- a/Zotlabs/Module/Menu.php +++ b/Zotlabs/Module/Menu.php @@ -65,7 +65,7 @@ class Menu extends \Zotlabs\Web\Controller { - function get() { + function get() { $uid = local_channel(); @@ -81,7 +81,7 @@ class Menu extends \Zotlabs\Web\Controller { if(argc() == 1) { - + $channel = (($sys) ? $sys : \App::get_channel()); // list menus $x = menu_list($uid); @@ -89,7 +89,7 @@ class Menu extends \Zotlabs\Web\Controller { for($y = 0; $y < count($x); $y ++) { $m = menu_fetch($x[$y]['menu_name'],$uid,get_observer_hash()); if($m) - $x[$y]['element'] = '[element]' . base64url_encode(json_encode(menu_element($m))) . '[/element]'; + $x[$y]['element'] = '[element]' . base64url_encode(json_encode(menu_element($channel,$m))) . '[/element]'; $x[$y]['bookmark'] = (($x[$y]['menu_flags'] & MENU_BOOKMARK) ? true : false); } } |