#196043 by chx: menu items saved in the update but broken on the new system (due to coming from disabled or old modules) were not possible to delete

1 files changed, 8 insertions, 6 deletions

diff --git a/includes/menu.inc b/includes/menu.inc
index 0b59c9362..d89629622 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1598,11 +1598,13 @@ function _menu_navigation_links_rebuild($menu) {
       }
     }
   }
-  $result = db_query("SELECT ml.link_path, ml.mlid, ml.router_path FROM {menu_links} ml WHERE ml.updated = 1");
+  $result = db_query("SELECT ml.link_path, ml.mlid, ml.router_path, ml.updated FROM {menu_links} ml WHERE ml.updated = 1");
   while ($item = db_fetch_array($result)) {
     $router_path = _menu_find_router_path($menu, $item['link_path']);
-    if (!empty($router_path) && $router_path != $item['router_path']) {
-      db_query("UPDATE {menu_links} SET router_path = '%s' WHERE mlid = %d", $router_path, $item['mlid']);
+    if (!empty($router_path) && ($router_path != $item['router_path'] || $item['updated'])) {
+      // If the router path and the link path matches, it's surely a working
+      // item, so we clear the updated flag.
+      db_query("UPDATE {menu_links} SET router_path = '%s', updated = %d WHERE mlid = %d", $router_path, $router_path != $item['link_path'], $item['mlid']);
     }
   }
 }
@@ -1631,9 +1633,9 @@ function menu_link_delete($mlid, $path = NULL) {
  * Helper function for menu_link_delete; deletes a single menu link.
  */
 function _menu_delete_item($item) {
-  // System-created items are never deleted.
-  if ($item && ($item['module'] != 'system')) {
-
+  // System-created items are never deleted. Updated items are an exception,
+  // as they can be broken.
+  if ($item && ($item['module'] != 'system' || $item['updated'])) {
     // Children get re-attached to the item's parent.
     if ($item['has_children']) {
       $result = db_query("SELECT mlid FROM {menu_links} WHERE plid = %d", $item['mlid']);