summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-10-01 13:22:43 +0000
committerDries Buytaert <dries@buytaert.net>2009-10-01 13:22:43 +0000
commit67e96428168dc612f7d4a8161a07bf686bff8db0 (patch)
tree61a7a69175ac1c6b75c1e94ca636205df7af8a6c
parent2ac0eb58a39eccd65291596af9801371424fca55 (diff)
downloadbrdo-67e96428168dc612f7d4a8161a07bf686bff8db0.tar.gz
brdo-67e96428168dc612f7d4a8161a07bf686bff8db0.tar.bz2
- Patch #576076 by yoroy, Gábor Hojtsy | Bojhan: remove the 'Add a main menu link'.
-rw-r--r--modules/simpletest/tests/menu.test4
-rw-r--r--profiles/default/default.install4
2 files changed, 3 insertions, 5 deletions
diff --git a/modules/simpletest/tests/menu.test b/modules/simpletest/tests/menu.test
index d8ac5a882..51d08700b 100644
--- a/modules/simpletest/tests/menu.test
+++ b/modules/simpletest/tests/menu.test
@@ -157,7 +157,9 @@ class MenuIncTestCase extends DrupalWebTestCase {
* Test menu_get_names().
*/
function testMenuGetNames() {
- $this->assertEqual(menu_get_names(), array('admin_shortcuts', 'main-menu', 'management', 'navigation', 'original', 'user-menu'), t('Expected menu names were returned.'));
+ // The main-menu is there but has no items by default, so not returned by
+ // menu_get_names(). Therefore we cannot check for that.
+ $this->assertEqual(menu_get_names(), array('admin_shortcuts', 'management', 'navigation', 'original', 'user-menu'), t('Expected menu names were returned.'));
}
/**
diff --git a/profiles/default/default.install b/profiles/default/default.install
index c4268dac7..8831f5435 100644
--- a/profiles/default/default.install
+++ b/profiles/default/default.install
@@ -205,10 +205,6 @@ function default_install() {
// Update the menu router information.
menu_rebuild();
- // Save some default links.
- $link = array('link_path' => 'admin/structure/menu/manage/main-menu/add', 'link_title' => 'Add a main menu link', 'menu_name' => 'main-menu');
- menu_link_save($link);
-
// Enable the admin theme.
db_update('system')
->fields(array('status' => 1))