Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
b7341701
Commit
b7341701
authored
Sep 08, 2006
by
Neil Drumm
Browse files
#82925
by Heine. Fix password reset mail variables.
parent
d0357e97
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/user/user.module
View file @
b7341701
...
...
@@ -1037,7 +1037,7 @@ function user_pass_submit($form_id, $form_values) {
$from = variable_get('site_mail', ini_get('sendmail_from'));
// Mail one time login URL and instructions.
$variables = array('
%
username' => $account->name, '
%
site' => variable_get('site_name', 'drupal'), '
%
login_url' => user_pass_reset_url($account), '
%
uri' => $base_url, '
%
uri_brief' => substr($base_url, strlen('http://')), '
%
mailto' => $account->mail, '
%
date' => format_date(time()), '
%
login_uri' => url('user', NULL, NULL, TRUE), '
%
edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE));
$variables = array('
!
username' => $account->name, '
!
site' => variable_get('site_name', 'drupal'), '
!
login_url' => user_pass_reset_url($account), '
!
uri' => $base_url, '
!
uri_brief' => substr($base_url, strlen('http://')), '
!
mailto' => $account->mail, '
!
date' => format_date(time()), '
!
login_uri' => url('user', NULL, NULL, TRUE), '
!
edit_uri' => url('user/'. $account->uid .'/edit', NULL, NULL, TRUE));
$subject = _user_mail_text('pass_subject', $variables);
$body = _user_mail_text('pass_body', $variables);
$mail_success = drupal_mail('user-pass', $account->mail, $subject, $body, $from);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment