harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2013-09-14 16:45:27 -07:00
commit 7a3d415267
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/menu.php
View File

@ -118,6 +118,8 @@ function menu_edit($arr) {
return false; 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", $r = q("select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1",
dbesc($menu_name), dbesc($menu_name),
intval($menu_channel_id) intval($menu_channel_id)
@ -128,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", $r = q("select * from menu where menu_id = %d and menu_channel_id = %d limit 1",
intval($menu_id), intval($menu_id),
intval($menu_channel_id) intval($menu_channel_id)
@ -141,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), dbesc($menu_name),
intval($menu_channel_id) intval($menu_channel_id),
dbesc($menu_desc)
); );
if($r) if($r)
return false; return false;
return q("update menu set menu_name = '%s', menu_desc = '%s' return q("update menu set menu_name = '%s', menu_desc = '%s'
where menu_id = %d and menu_channel_id = %d limit 1", where menu_id = %d and menu_channel_id = %d limit 1",
dbesc($menu_name), dbesc($menu_name),