diff --git a/modules/simpletest/tests/upgrade/upgrade.test b/modules/simpletest/tests/upgrade/upgrade.test index 8a3da81..b31f2af 100644 --- a/modules/simpletest/tests/upgrade/upgrade.test +++ b/modules/simpletest/tests/upgrade/upgrade.test @@ -402,5 +402,10 @@ class BasicUpgradePath extends UpgradePathTestCase { // 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')); + + // Confirm that the install profile is enabled. + $profile = variable_get('install_profile', 'standard'); + $result = db_query('SELECT COUNT(*) from {system} WHERE name = :profile AND status = 1', array(':profile' => $profile)); + $this->assertTrue($result, 'The install profile is enabled after upgrade.'); } } diff --git a/modules/system/system.install b/modules/system/system.install index e067444..bb9d747 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -2967,5 +2967,35 @@ function system_update_7071() { /** * @} End of "defgroup updates-6.x-to-7.x" + */ + +/** + * @defgroup updates-7.x-extra Extra updates for 7.x + * @{ + */ + +/** + * Migrate the "Default menu for content" setting to individual node types. + */ +function system_update_7072() { + if (!db_query("SELECT 1 FROM {system} WHERE type = 'profile' AND status = 1")->fetchField()) { + system_rebuild_module_data(); + db_update('system') + ->fields(array('status' => 1)) + ->condition('name', variable_get('install_profile', 'standard')) + ->execute(); + system_list_reset(); + } +} + +/** + * @} End of "defgroup updates-7.x-extra" + * The next series of updates should start at 8000. + */ + + + * + * + * * The next series of updates should start at 8000. */