From ff8dab60953278a47dab04feb72a0b66b0d84e33 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 15 Dec 2005 21:53:49 +0000
Subject: [PATCH] - Patch #40847: after menu reset, primary and secondary menus
 need to be recreated.

---
 modules/menu.module      | 10 ++++++++--
 modules/menu/menu.module | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/modules/menu.module b/modules/menu.module
index 019591cc9e6..37cf137b779 100644
--- a/modules/menu.module
+++ b/modules/menu.module
@@ -237,6 +237,9 @@ function menu_reset() {
   switch ($op) {
     case t('Reset all'):
       db_query('DELETE FROM {menu}');
+      $mid = menu_edit_item_save(array('title' => t('Primary menu links'), 'pid' => 0, 'type' => MENU_CUSTOM_MENU));
+      variable_set('menu_primary_menu', $mid);
+      variable_set('menu_secondary_menu', $mid);
       drupal_set_message(t('The menu items have been reset to their default settings.'));
       drupal_goto('admin/menu');
       break;
@@ -447,6 +450,8 @@ function menu_edit_item_validate($edit) {
 
 /**
  * Save changes to a menu item into the database.
+ *
+ * @return mid
  */
 function menu_edit_item_save($edit) {
   $menu = menu_get_menu();
@@ -463,10 +468,11 @@ function menu_edit_item_save($edit) {
     drupal_set_message(t('The menu item %title has been updated.', array('%title' => theme('placeholder', $edit['title']))));
   }
   else {
-    $mid = db_next_id('{menu}_mid');
-    db_query("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) VALUES (%d, %d, '%s', '%s', '%s', %d, %d)", $mid, $edit['pid'], $edit['path'], $edit['title'], $edit['description'], $edit['weight'], $edit['type'] | MENU_MODIFIED_BY_ADMIN);
+    $edit['mid'] = db_next_id('{menu}_mid');
+    db_query("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) VALUES (%d, %d, '%s', '%s', '%s', %d, %d)", $edit['mid'], $edit['pid'], $edit['path'], $edit['title'], $edit['description'], $edit['weight'], $edit['type'] | MENU_MODIFIED_BY_ADMIN);
     drupal_set_message(t('The menu item %title has been created.', array('%title' => theme('placeholder', $edit['title']))));
   }
+  return $edit['mid'];
 }
 
 /**
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 019591cc9e6..37cf137b779 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -237,6 +237,9 @@ function menu_reset() {
   switch ($op) {
     case t('Reset all'):
       db_query('DELETE FROM {menu}');
+      $mid = menu_edit_item_save(array('title' => t('Primary menu links'), 'pid' => 0, 'type' => MENU_CUSTOM_MENU));
+      variable_set('menu_primary_menu', $mid);
+      variable_set('menu_secondary_menu', $mid);
       drupal_set_message(t('The menu items have been reset to their default settings.'));
       drupal_goto('admin/menu');
       break;
@@ -447,6 +450,8 @@ function menu_edit_item_validate($edit) {
 
 /**
  * Save changes to a menu item into the database.
+ *
+ * @return mid
  */
 function menu_edit_item_save($edit) {
   $menu = menu_get_menu();
@@ -463,10 +468,11 @@ function menu_edit_item_save($edit) {
     drupal_set_message(t('The menu item %title has been updated.', array('%title' => theme('placeholder', $edit['title']))));
   }
   else {
-    $mid = db_next_id('{menu}_mid');
-    db_query("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) VALUES (%d, %d, '%s', '%s', '%s', %d, %d)", $mid, $edit['pid'], $edit['path'], $edit['title'], $edit['description'], $edit['weight'], $edit['type'] | MENU_MODIFIED_BY_ADMIN);
+    $edit['mid'] = db_next_id('{menu}_mid');
+    db_query("INSERT INTO {menu} (mid, pid, path, title, description, weight, type) VALUES (%d, %d, '%s', '%s', '%s', %d, %d)", $edit['mid'], $edit['pid'], $edit['path'], $edit['title'], $edit['description'], $edit['weight'], $edit['type'] | MENU_MODIFIED_BY_ADMIN);
     drupal_set_message(t('The menu item %title has been created.', array('%title' => theme('placeholder', $edit['title']))));
   }
+  return $edit['mid'];
 }
 
 /**