diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-09-24 00:37:45 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-09-24 00:37:45 +0000 |
| commit | c9de4646c570a45de03d6e7ec470daf01a8d2cab (patch) | |
| tree | 5d8781ec52d1cf25c5ca1a842d2a7a65bf0f7e95 /modules/menu | |
| parent | 4bd74a00668557ce827e4c51d7c278548518aaf8 (diff) | |
| download | brdo-c9de4646c570a45de03d6e7ec470daf01a8d2cab.tar.gz brdo-c9de4646c570a45de03d6e7ec470daf01a8d2cab.tar.bz2 | |
- Patch #907690 by sun, pwolanin: breadcrumbs don't work for dynamic paths and local tasks #2.
Diffstat (limited to 'modules/menu')
| -rw-r--r-- | modules/menu/menu.module | 7 | ||||
| -rw-r--r-- | modules/menu/menu.test | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/modules/menu/menu.module b/modules/menu/menu.module index fc7a655b8..ded4bd21c 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -95,7 +95,6 @@ function menu_menu() { 'title callback' => 'menu_overview_title', 'title arguments' => array(4), 'access arguments' => array('administer menu'), - 'type' => MENU_CALLBACK, 'file' => 'menu.admin.inc', ); $items['admin/structure/menu/manage/%menu/list'] = array( @@ -126,7 +125,6 @@ function menu_menu() { 'page callback' => 'menu_delete_menu_page', 'page arguments' => array(4), 'access arguments' => array('administer menu'), - 'type' => MENU_CALLBACK, 'file' => 'menu.admin.inc', ); $items['admin/structure/menu/item/%menu_link/edit'] = array( @@ -134,7 +132,6 @@ function menu_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('menu_edit_item', 'edit', 4, NULL), 'access arguments' => array('administer menu'), - 'type' => MENU_CALLBACK, 'file' => 'menu.admin.inc', ); $items['admin/structure/menu/item/%menu_link/reset'] = array( @@ -142,7 +139,6 @@ function menu_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('menu_reset_item_confirm', 4), 'access arguments' => array('administer menu'), - 'type' => MENU_CALLBACK, 'file' => 'menu.admin.inc', ); $items['admin/structure/menu/item/%menu_link/delete'] = array( @@ -150,7 +146,6 @@ function menu_menu() { 'page callback' => 'menu_item_delete_page', 'page arguments' => array(4), 'access arguments' => array('administer menu'), - 'type' => MENU_CALLBACK, 'file' => 'menu.admin.inc', ); return $items; @@ -707,7 +702,7 @@ function menu_form_node_type_form_alter(&$form, $form_state) { $form['menu']['menu_options'] = array( '#type' => 'checkboxes', '#title' => t('Available menus'), - '#default_value' => variable_get('menu_options_' . $type->type, array('main-menu' => 'main-menu')), + '#default_value' => variable_get('menu_options_' . $type->type, array('main-menu')), '#options' => $menu_options, '#description' => t('The menus available to place links in for this content type.'), ); diff --git a/modules/menu/menu.test b/modules/menu/menu.test index 1fa76f188..2c5900181 100644 --- a/modules/menu/menu.test +++ b/modules/menu/menu.test @@ -112,14 +112,14 @@ class MenuTestCase extends DrupalWebTestCase { // Assert the new menu. $this->drupalGet('admin/structure/menu/manage/' . $menu_name . '/edit'); - $this->assertText($title, t('Custom menu was added.')); + $this->assertRaw($title, t('Custom menu was added.')); // Edit the menu. $new_title = $this->randomName(16); $menu['title'] = $new_title; menu_save($menu); $this->drupalGet('admin/structure/menu/manage/' . $menu_name . '/edit'); - $this->assertText($new_title, t('Custom menu was edited.')); + $this->assertRaw($new_title, t('Custom menu was edited.')); } /** |