diff options
| author | zottel <github@zottel.net> | 2016-08-01 14:07:18 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2016-08-01 14:07:18 +0200 |
| commit | 55eda16b61041cf5d3aa941f3b2b4329246b1028 (patch) | |
| tree | 175b6395415767523f1046ee42d654efaf1dac8a /include/menu.php | |
| parent | b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f (diff) | |
| parent | 3d0c90cbc5b756c6d54c4d41a136c0a38e67b013 (diff) | |
| download | volse-hubzilla-55eda16b61041cf5d3aa941f3b2b4329246b1028.tar.gz volse-hubzilla-55eda16b61041cf5d3aa941f3b2b4329246b1028.tar.bz2 volse-hubzilla-55eda16b61041cf5d3aa941f3b2b4329246b1028.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'include/menu.php')
| -rw-r--r-- | include/menu.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/menu.php b/include/menu.php index e8f1d8eb8..71d0e3ffe 100644 --- a/include/menu.php +++ b/include/menu.php @@ -25,7 +25,7 @@ function menu_fetch($name,$uid,$observer_xchan) { return null; } -function menu_element($menu) { +function menu_element($channel,$menu) { $arr = array(); $arr['type'] = 'menu'; @@ -46,7 +46,12 @@ function menu_element($menu) { $arr['items'] = array(); foreach($menu['items'] as $it) { $entry = array(); + + $entry['link'] = str_replace(z_root() . '/channel/' . $channel['channel_address'],'[channelurl]',$it['mitem_link']); + $entry['link'] = str_replace(z_root() . '/page/' . $channel['channel_address'],'[pageurl]',$it['mitem_link']); + $entry['link'] = str_replace(z_root() . '/store/' . $channel['channel_address'],'[storeurl]',$it['mitem_link']); $entry['link'] = str_replace(z_root(),'[baseurl]',$it['mitem_link']); + $entry['desc'] = $it['mitem_desc']; $entry['order'] = $it['mitem_order']; if($it['mitem_flags']) { @@ -389,12 +394,13 @@ function menu_del_item($menu_id,$uid,$item_id) { function menu_sync_packet($uid,$observer_hash,$menu_id,$delete = false) { $r = menu_fetch_id($menu_id,$uid); + $c = channelx_by_n($uid); if($r) { $m = menu_fetch($r['menu_name'],$uid,$observer_hash); if($m) { if($delete) $m['menu_delete'] = 1; - build_sync_packet($uid,array('menu' => array(menu_element($m)))); + build_sync_packet($uid,array('menu' => array(menu_element($c,$m)))); } } } |