From 69e8ffed98fb978682c03fe5fbdc0fa4ba0c70f4 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Fri, 8 Oct 2010 18:19:11 +0000
Subject: [PATCH] #932134 by catch: Fixed no upgrade path for MENU_CALLBACK API
change.
---
modules/simpletest/tests/upgrade/upgrade.test | 4 ++++
modules/system/system.install | 13 +++++++++++++
2 files changed, 17 insertions(+)
diff --git a/modules/simpletest/tests/upgrade/upgrade.test b/modules/simpletest/tests/upgrade/upgrade.test
index 3d463c95f71f..4220faebbf75 100644
--- a/modules/simpletest/tests/upgrade/upgrade.test
+++ b/modules/simpletest/tests/upgrade/upgrade.test
@@ -381,5 +381,9 @@ class BasicUpgradePath extends UpgradePathTestCase {
$this->assertText(t('Reports'));
$this->assertText(t('Structure'));
$this->assertText(t('Modules'));
+
+ // Confirm that no {menu_links} entry exists for user/autocomplete.
+ $result = db_query('SELECT COUNT(*) FROM {menu_links} WHERE link_path = :user_autocomplete', array(':user_autocomplete' => 'user/autocomplete'))->fetchField();
+ $this->assertFalse($result, t('No {menu_links} entry exists for user/autocomplete'));
}
}
diff --git a/modules/system/system.install b/modules/system/system.install
index eae01725fe35..9c9bc2d8c206 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -2862,6 +2862,19 @@ function system_update_7062() {
db_add_index('system', 'system_list', array('status', 'bootstrap', 'type', 'weight', 'name'));
}
+/**
+ * Delete {menu_links} records for 'type' => MENU_CALLBACK which would not appear in a fresh install.
+ */
+function system_update_7063() {
+ // For router items where 'type' => MENU_CALLBACK, {menu_router}.type is
+ // stored as 4 in Drupal 6, and 0 in Drupal 7. Fortunately Drupal 7 doesn't
+ // store any types as 4, so delete both.
+ $result = db_query('SELECT ml.mlid FROM {menu_links} ml INNER JOIN {menu_router} mr ON ml.router_path = mr.path WHERE ml.module = :system AND ml.customized = 0 AND mr.type IN(:callbacks)', array(':callbacks' => array(0, 4), ':system' => 'system'));
+ foreach ($result as $record) {
+ db_delete('menu_links')->condition('mlid', $record->mlid)->execute();
+ }
+}
+
/**
* @} End of "defgroup updates-6.x-to-7.x"
* The next series of updates should start at 8000.
--
GitLab