@@ -895,9 +895,6 @@ function user_login_submit($form_id, $form_values) {
db_query("UPDATE {users} SET login = %d WHERE uid = %d",time(),$user->uid);
user_module_invoke('login',$form_values,$user);
// Redirect the user to the page he logged on from.
drupal_goto();
}
}
...
...
@@ -1012,7 +1009,7 @@ function user_pass_submit($form_id, $form_values) {
watchdog('user',t('Error mailing password reset instructions to %name at %email.',array('%name'=>theme('placeholder',$account->name),'%email'=>theme('placeholder',$account->mail))),WATCHDOG_ERROR);
drupal_set_message(t('Unable to send mail. Please contact the site admin.'));
}
drupal_goto('user');
return'user';
}
functiontheme_user_pass($form){
...
...
@@ -1135,7 +1132,7 @@ function user_register_submit($form_id, $form_values) {
drupal_set_message(t('Your password and further instructions have been sent to your e-mail address.'));
drupal_goto();
}
else{
// Create new user account, administrator approval required.
...
...
@@ -1179,7 +1175,6 @@ function user_register_submit($form_id, $form_values) {
user_mail(variable_get('site_mail',ini_get('sendmail_from')),$subject,t("%u has applied for an account.\n\n%uri",array('%u'=>$account->name,'%uri'=>url("user/$account->uid/edit",NULL,NULL,TRUE))),"From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
drupal_set_message(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.<br />In the meantime, your password and further instructions have been sent to your e-mail address.'));
drupal_goto();
}
}
}
...
...
@@ -1328,7 +1323,7 @@ function user_edit_submit($form_id, $form_values) {
// Delete that user's menu cache.
cache_clear_all('menu:'.$account->uid,TRUE);
drupal_set_message(t('The changes have been saved.'));
drupal_goto('user/'.$account->uid);
return'user/'.$account->uid;
}
functionuser_view($uid=0){
...
...
@@ -1497,7 +1492,7 @@ function user_admin_access_delete($aid = 0) {
@@ -895,9 +895,6 @@ function user_login_submit($form_id, $form_values) {
db_query("UPDATE {users} SET login = %d WHERE uid = %d",time(),$user->uid);
user_module_invoke('login',$form_values,$user);
// Redirect the user to the page he logged on from.
drupal_goto();
}
}
...
...
@@ -1012,7 +1009,7 @@ function user_pass_submit($form_id, $form_values) {
watchdog('user',t('Error mailing password reset instructions to %name at %email.',array('%name'=>theme('placeholder',$account->name),'%email'=>theme('placeholder',$account->mail))),WATCHDOG_ERROR);
drupal_set_message(t('Unable to send mail. Please contact the site admin.'));
}
drupal_goto('user');
return'user';
}
functiontheme_user_pass($form){
...
...
@@ -1135,7 +1132,7 @@ function user_register_submit($form_id, $form_values) {
drupal_set_message(t('Your password and further instructions have been sent to your e-mail address.'));
drupal_goto();
}
else{
// Create new user account, administrator approval required.
...
...
@@ -1179,7 +1175,6 @@ function user_register_submit($form_id, $form_values) {
user_mail(variable_get('site_mail',ini_get('sendmail_from')),$subject,t("%u has applied for an account.\n\n%uri",array('%u'=>$account->name,'%uri'=>url("user/$account->uid/edit",NULL,NULL,TRUE))),"From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
drupal_set_message(t('Thank you for applying for an account. Your account is currently pending approval by the site administrator.<br />In the meantime, your password and further instructions have been sent to your e-mail address.'));
drupal_goto();
}
}
}
...
...
@@ -1328,7 +1323,7 @@ function user_edit_submit($form_id, $form_values) {
// Delete that user's menu cache.
cache_clear_all('menu:'.$account->uid,TRUE);
drupal_set_message(t('The changes have been saved.'));
drupal_goto('user/'.$account->uid);
return'user/'.$account->uid;
}
functionuser_view($uid=0){
...
...
@@ -1497,7 +1492,7 @@ function user_admin_access_delete($aid = 0) {