Index: modules/menu/menu.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v retrieving revision 1.71 diff -u -p -r1.71 menu.admin.inc --- modules/menu/menu.admin.inc 3 Jan 2010 21:01:04 -0000 1.71 +++ modules/menu/menu.admin.inc 24 Jan 2010 12:09:24 -0000 @@ -63,7 +63,7 @@ function menu_overview_form($form, &$for $form = array_merge($form, _menu_overview_tree_form($tree)); $form['#menu'] = $menu; - + if (element_children($form)) { $form['actions'] = array('#type' => 'container', '#attributes' => array('class' => array('form-actions'))); $form['actions']['submit'] = array( @@ -174,6 +174,7 @@ function menu_overview_form_submit($form $item['customized'] = 1; menu_link_save($item); } + drupal_set_message(t('Your configuration has been saved.')); } /** @@ -372,17 +373,25 @@ function menu_item_delete_submit($form, */ function menu_edit_item_submit($form, &$form_state) { $item = &$form_state['values']; - // The value of "hidden" is the opposite of the value // supplied by the "enabled" checkbox. $item['hidden'] = (int) !$item['enabled']; unset($item['enabled']); + $is_new = (bool) $item['mlid']; $item['options']['attributes']['title'] = $item['description']; list($item['menu_name'], $item['plid']) = explode(':', $item['parent']); if (!menu_link_save($item)) { drupal_set_message(t('There was an error saving the menu link.'), 'error'); } + else { + if ($is_new) { + drupal_set_message(t('Updated menu link %name.', array('%name' => $item['link_title']))); + } + else { + drupal_set_message(t('Created new menu link %name.', array('%name' => $item['link_title']))); + } + } $form_state['redirect'] = 'admin/structure/menu/manage/' . $item['menu_name']; } @@ -526,7 +535,7 @@ function menu_delete_menu_confirm_submit menu_delete($menu); $t_args = array('%title' => $menu['title']); - drupal_set_message(t('The custom menu %title has been deleted.', $t_args)); + drupal_set_message(t('Deleted custom menu %title and all its menu links.', $t_args)); watchdog('menu', 'Deleted custom menu %title and all its menu links.', $t_args, WATCHDOG_NOTICE); } @@ -574,6 +583,7 @@ function menu_edit_menu_submit($form, &$ menu_link_save($link); menu_save($menu); + drupal_set_message(t('Created new menu %name.', array('%name' => $menu['title']))); } else { menu_save($menu); @@ -582,6 +592,7 @@ function menu_edit_menu_submit($form, &$ $link = menu_link_load($m['mlid']); $link['link_title'] = $menu['title']; menu_link_save($link); + drupal_set_message(t('Updated menu %name.', array('%name' => $menu['title']))); } } $form_state['redirect'] = $path . $menu['menu_name']; @@ -615,7 +626,7 @@ function menu_item_delete_form_submit($f $item = $form['#item']; menu_link_delete($item['mlid']); $t_args = array('%title' => $item['link_title']); - drupal_set_message(t('The menu link %title has been deleted.', $t_args)); + drupal_set_message(t('Deleted menu link %title.', $t_args)); watchdog('menu', 'Deleted menu link %title.', $t_args, WATCHDOG_NOTICE); $form_state['redirect'] = 'admin/structure/menu/manage/' . $item['menu_name']; } Index: modules/menu/menu.test =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.test,v retrieving revision 1.31 diff -u -p -r1.31 menu.test --- modules/menu/menu.test 9 Jan 2010 21:54:00 -0000 1.31 +++ modules/menu/menu.test 24 Jan 2010 12:09:25 -0000 @@ -177,7 +177,7 @@ class MenuTestCase extends DrupalWebTest // Delete custom menu. $this->drupalPost("admin/structure/menu/manage/$menu_name/delete", array(), t('Delete')); $this->assertResponse(200); - $this->assertRaw(t('The custom menu %title has been deleted.', array('%title' => $title)), t('Custom menu was deleted')); + $this->assertRaw(t('Deleted custom menu %title and all its menu links.', array('%title' => $title)), t('Custom menu was deleted')); $this->assertFalse(menu_load($menu_name), 'Custom menu was deleted'); // Test if all menu links associated to the menu were removed from database. $result = db_query("SELECT menu_name FROM {menu_links} WHERE menu_name = :menu_name", array(':menu_name' => $menu_name))->fetchField(); @@ -387,8 +387,7 @@ class MenuTestCase extends DrupalWebTest // Delete menu link. $this->drupalPost("admin/structure/menu/item/$mlid/delete", array(), t('Confirm')); $this->assertResponse(200); - $this->assertRaw(t('The menu link %title has been deleted.', array('%title' => $title)), t('Menu link was deleted')); - + $this->assertRaw(t('Deleted menu link %title.', array('%title' => $title)), t('Menu link was deleted')); // Verify deletion. $this->drupalGet(''); $this->assertNoText($title, 'Menu link was deleted');