diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-10-27 14:01:12 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-10-27 14:01:12 +0000 |
| commit | 8dcb5ab976287306a889ce9bb6d84b540f898694 (patch) | |
| tree | 7c14240fcf776026aea091f44a3f895d55d127ac /modules/user | |
| parent | 47137a637011faf2800319e6d4b1aa325b3d2142 (diff) | |
| download | brdo-8dcb5ab976287306a889ce9bb6d84b540f898694.tar.gz brdo-8dcb5ab976287306a889ce9bb6d84b540f898694.tar.bz2 | |
#182528 by RobRoy: move drupal_set_message() out of user deletion API function to UI function
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/user.module | 1 | ||||
| -rw-r--r-- | modules/user/user.pages.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index b7bde6049..4de22e134 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1410,7 +1410,6 @@ function user_delete($edit, $uid) { db_query('DELETE FROM {authmap} WHERE uid = %d', $uid); $variables = array('%name' => $account->name, '%email' => '<'. $account->mail .'>'); watchdog('user', 'Deleted user: %name %email.', $variables, WATCHDOG_NOTICE); - drupal_set_message(t('%name has been deleted.', $variables)); module_invoke_all('user', 'delete', $edit, $account); } diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc index 1188b2518..7d0400d96 100644 --- a/modules/user/user.pages.inc +++ b/modules/user/user.pages.inc @@ -320,6 +320,8 @@ function user_confirm_delete(&$form_state, $account) { */ function user_confirm_delete_submit($form, &$form_state) { user_delete($form_state['values'], $form_state['values']['_account']->uid); + drupal_set_message(t('%name has been deleted.', array('%name' => $form_state['values']['_account']->name))); + if (!isset($_REQUEST['destination'])) { $form_state['redirect'] = 'admin/user/user'; } |