From 17898e7b0ba169b76f13a51ba39555a0c22205ad Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Tue, 16 Aug 2011 01:22:08 -0500
Subject: Issue #1231856 by lyricnz: Fixed menu_update_7001() breaks when
 updating from 7.4 or upgrading from D6.

---
 modules/menu/menu.install | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'modules/menu')

diff --git a/modules/menu/menu.install b/modules/menu/menu.install
index 13cb3cb50..3b75ad436 100644
--- a/modules/menu/menu.install
+++ b/modules/menu/menu.install
@@ -120,6 +120,8 @@ function menu_update_7001() {
   }
 
   // Rename each menu, and any settings that refer to the old menu name.
+  // - "Primary Links" has become system menu "Main menu".
+  // - "Secondary Links" has become a new custom menu "Secondary menu".
   $rename = array(
     'primary-links' => array('main-menu', 'Main menu'),
     'secondary-links' => array('secondary-menu', 'Secondary menu'),
@@ -160,6 +162,23 @@ function menu_update_7001() {
   }
 }
 
+/**
+ * Rename the primary/secondary menu blocks to match previously renamed menus.
+ */
+function menu_update_7002(&$sandbox) {
+  $renamed_deltas = array(
+    'menu' => array(
+      'primary-links' => 'main-menu',
+      'secondary-links' => 'secondary-menu',
+    ),
+  );
+
+  $moved_deltas = array(
+    'menu' => array('main-menu' => 'system'),
+  );
+
+  update_fix_d7_block_deltas($sandbox, $renamed_deltas, $moved_deltas);
+}
 /**
  * @} End of "defgroup updates-7.x-extra"
  * The next series of updates should start at 8000.
-- 
cgit v1.2.3