aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-14 16:45:27 -0700
committerfriendica <info@friendica.com>2013-09-14 16:45:27 -0700
commit7a3d415267ebdb2880145e4df78f3a52a2c0082b (patch)
treea271fe90912939df7b0d359ea34fa1eb1711075f /include
parent44ed6b0adcd3c9cd65bd847de0a64ea90da0e1d2 (diff)
parentd9f3073b60b033eb430ad879fbb414c8ecfcfc65 (diff)
downloadvolse-hubzilla-7a3d415267ebdb2880145e4df78f3a52a2c0082b.tar.gz
volse-hubzilla-7a3d415267ebdb2880145e4df78f3a52a2c0082b.tar.bz2
volse-hubzilla-7a3d415267ebdb2880145e4df78f3a52a2c0082b.zip
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'include')
-rw-r--r--include/menu.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/menu.php b/include/menu.php
index 6d614055a..900b48e65 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -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),