diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-11 06:42:11 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-11 06:42:11 +0200 |
| commit | edb1473f13a87ccfdfe2555ac9ab798fbc073805 (patch) | |
| tree | 18a15afbca3cdbbf262e0737d01e23e7b4905cf1 /include/menu.php | |
| parent | 2f73d24ab134391c3b3a69d5cbfede42e028b5ed (diff) | |
| parent | f2171173fe2c9a0596672da293eb756a514ff789 (diff) | |
| download | volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.tar.gz volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.tar.bz2 volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/menu.php')
| -rw-r--r-- | include/menu.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/include/menu.php b/include/menu.php index 7ed931a59..075372515 100644 --- a/include/menu.php +++ b/include/menu.php @@ -6,7 +6,7 @@ require_once('include/bbcode.php'); function menu_fetch($name,$uid,$observer_xchan) { - $sql_options = permissions_sql($uid); + $sql_options = permissions_sql($uid,$observer_xchan); $r = q("select * from menu where menu_channel_id = %d and menu_name = '%s' limit 1", intval($uid), @@ -238,7 +238,6 @@ function menu_edit($arr) { return false; } - $r = q("select * from menu where menu_id = %d and menu_channel_id = %d limit 1", intval($menu_id), intval($menu_channel_id) @@ -388,3 +387,14 @@ function menu_del_item($menu_id,$uid,$item_id) { return $r; } +function menu_sync_packet($uid,$observer_hash,$menu_id,$delete = false) { + $r = menu_fetch_id($menu_id,$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)))); + } + } +} |