Index: modules/menu/menu.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v retrieving revision 1.68 diff -u -p -r1.68 menu.admin.inc --- modules/menu/menu.admin.inc 4 Nov 2009 04:43:58 -0000 1.68 +++ modules/menu/menu.admin.inc 4 Dec 2009 09:43:12 -0000 @@ -172,6 +172,7 @@ function menu_overview_form_submit($form $item['customized'] = 1; menu_link_save($item); } + drupal_set_message(t('Your configuration has been saved.')); } /** @@ -391,6 +392,16 @@ function menu_edit_item_submit($form, &$ if (!menu_link_save($item)) { drupal_set_message(t('There was an error saving the menu link.'), 'error'); } + + // display status message + $op = $form_state['build_info']['args'][0]; + if ($op === 'add') { + drupal_set_message(t('Created new menu link %name.', array('%name' => $item['link_title']))); + } + elseif ($op === 'edit') { + drupal_set_message(t('Updated menu link %name.', array('%name' => $item['link_title']))); + } + $form_state['redirect'] = 'admin/structure/menu/manage/' . $item['menu_name']; } @@ -534,7 +545,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); } @@ -582,6 +593,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); @@ -591,6 +603,7 @@ function menu_edit_menu_submit($form, &$ $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']; } @@ -623,7 +636,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.27 diff -u -p -r1.27 menu.test --- modules/menu/menu.test 2 Dec 2009 19:26:22 -0000 1.27 +++ modules/menu/menu.test 4 Dec 2009 09:43:12 -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(); @@ -388,7 +388,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('');