diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-11 00:24:25 -0700 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-11 00:24:25 -0700 |
| commit | 7a63d5e50b0ae16a38e673867abd6043d4becc07 (patch) | |
| tree | 6d174d12a0de707ed8f875801a8dbc0c35f70d3f /include/menu.php | |
| parent | c2a88c3e4858e3eb2c553bdc775d2f684b0d46b4 (diff) | |
| parent | 89fc319c900873be58fa677707518646f6c79eec (diff) | |
| download | volse-hubzilla-7a63d5e50b0ae16a38e673867abd6043d4becc07.tar.gz volse-hubzilla-7a63d5e50b0ae16a38e673867abd6043d4becc07.tar.bz2 volse-hubzilla-7a63d5e50b0ae16a38e673867abd6043d4becc07.zip | |
Merge pull request #2 from friendica/master
Upgraded to latest red
Diffstat (limited to 'include/menu.php')
| -rw-r--r-- | include/menu.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/menu.php b/include/menu.php index 8d4664385..900b48e65 100644 --- a/include/menu.php +++ b/include/menu.php @@ -40,6 +40,7 @@ function menu_render($menu) { } + function menu_fetch_id($menu_id,$channel_id) { $r = q("select * from menu where menu_id = %d and menu_channel_id = %d limit 1", @@ -117,6 +118,8 @@ function menu_edit($arr) { return false; + $menu_channel_id = intval($arr['menu_channel_id']); + $r = q("select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1", dbesc($menu_name), intval($menu_channel_id) @@ -127,9 +130,6 @@ function menu_edit($arr) { } - - $menu_channel_id = intval($arr['menu_channel_id']); - $r = q("select * from menu where menu_id = %d and menu_channel_id = %d limit 1", intval($menu_id), intval($menu_channel_id) @@ -140,14 +140,16 @@ function menu_edit($arr) { } - $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d limit 1", + $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d and menu_desc = '%s' limit 1", dbesc($menu_name), - intval($menu_channel_id) + intval($menu_channel_id), + dbesc($menu_desc) ); if($r) return false; + return q("update menu set menu_name = '%s', menu_desc = '%s' where menu_id = %d and menu_channel_id = %d limit 1", dbesc($menu_name), |