Merge https://github.com/friendica/red into zpull
This commit is contained in:
commit
7a3d415267
@ -118,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)
|
||||
@ -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",
|
||||
intval($menu_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),
|
||||
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),
|
||||
|
Reference in New Issue
Block a user