summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2007-08-22 14:48:39 +0000
committerDries Buytaert <dries@buytaert.net>2007-08-22 14:48:39 +0000
commitfb322f08daef243ec46650bd3cd37343a6b6759d (patch)
tree79958a8c69d30cd09a0704ff60de56d43bce92e3 /modules
parentb60a85a0c244d33b8ea14490c462de8a3f7e5cd9 (diff)
downloadbrdo-fb322f08daef243ec46650bd3cd37343a6b6759d.tar.gz
brdo-fb322f08daef243ec46650bd3cd37343a6b6759d.tar.bz2
- Patch #169065 by pwolanin: links to new menus can exist outside 'navigation'.
Diffstat (limited to 'modules')
-rw-r--r--modules/menu/menu.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 999e16761..f312d98aa 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -131,7 +131,7 @@ function menu_enable() {
menu_rebuild();
$result = db_query("SELECT * FROM {menu_custom}");
$link['module'] = 'menu';
- $link['plid'] = db_result(db_query("SELECT mlid FROM {menu_links} WHERE menu_name = '%s' AND link_path = '%s'", 'navigation', 'admin/build/menu'));
+ $link['plid'] = db_result(db_query("SELECT mlid FROM {menu_links} WHERE link_path = '%s' AND module = '%s'", 'admin/build/menu', 'system'));
$link['router_path'] = 'admin/build/menu-customize/%';
while ($menu = db_fetch_array($result)) {
@@ -582,7 +582,7 @@ function menu_edit_menu_submit($form, &$form_state) {
$link['link_path'] = $path . $menu['menu_name'];
$link['router_path'] = $path .'%';
$link['module'] = 'menu';
- $link['plid'] = db_result(db_query("SELECT mlid FROM {menu_links} WHERE menu_name = '%s' AND link_path = '%s'", 'navigation', 'admin/build/menu'));
+ $link['plid'] = db_result(db_query("SELECT mlid FROM {menu_links} WHERE link_path = '%s' AND module = '%s'", 'admin/build/menu', 'system'));
menu_link_save($link);
db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", $menu['menu_name'], $menu['title'], $menu['description']);
}