Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
drupal
Commits
35cad55e
Commit
35cad55e
authored
Aug 05, 2004
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Patch
#8523
by killes: avoid profile data being deleted when requesting a new password.
parent
f971b768
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
modules/user.module
modules/user.module
+3
-3
modules/user/user.module
modules/user/user.module
+3
-3
No files found.
modules/user.module
View file @
35cad55e
...
...
@@ -883,11 +883,11 @@ function user_pass($edit = array()) {
global
$base_url
;
if
(
$edit
[
'name'
])
{
$account
=
db_fetch_object
(
db_query
(
"SELECT uid, name, mail FROM
{
users
}
WHERE status = 1 AND LOWER(
name
)
=
'%s'"
,
strtolower
(
$edit
[
'name'
])
));
$account
=
user_load
(
array
(
'
name
'
=
>
$edit
[
'name'
],
'status'
=>
1
));
if
(
!
$account
)
form_set_error
(
'name'
,
t
(
'Sorry. The username "<i>%s</i>" is not recognized.'
,
array
(
'%s'
=>
$edit
[
'name'
])));
}
else
if
(
$edit
[
'mail'
])
{
$account
=
db_fetch_object
(
db_query
(
"SELECT uid, name, mail FROM
{
users
}
WHERE status = 1 AND LOWER(
mail
)
=
'%s'"
,
strtolower
(
$edit
[
'mail'
])
));
$account
=
user_load
(
array
(
'
mail
'
=
>
$edit
[
'mail'
],
'status'
=>
1
));
if
(
!
$account
)
form_set_error
(
'name'
,
t
(
'Sorry. The e-mail address "<i>%s</i>" is not recognized.'
,
array
(
'%s'
=>
$edit
[
'mail'
])));
}
if
(
$account
)
{
...
...
@@ -896,7 +896,7 @@ function user_pass($edit = array()) {
$pass
=
user_password
();
// Save new password:
user_save
(
$account
,
array
(
'pass'
=>
$pass
));
user_save
(
$account
,
array_merge
(
object2array
(
$account
),
array
(
'pass'
=>
$pass
))
)
;
// Mail new password:
$variables
=
array
(
'%username'
=>
$account
->
name
,
'%site'
=>
variable_get
(
'site_name'
,
'drupal'
),
'%password'
=>
$pass
,
'%uri'
=>
$base_url
,
'%uri_brief'
=>
substr
(
$base_url
,
strlen
(
'http://'
)),
'%mailto'
=>
$account
->
mail
,
'%date'
=>
format_date
(
time
()),
'%login_uri'
=>
url
(
'user/login'
,
NULL
,
NULL
,
TRUE
),
'%edit_uri'
=>
url
(
'user/edit'
,
NULL
,
NULL
,
TRUE
));
...
...
modules/user/user.module
View file @
35cad55e
...
...
@@ -883,11 +883,11 @@ function user_pass($edit = array()) {
global
$base_url
;
if
(
$edit
[
'name'
])
{
$account
=
db_fetch_object
(
db_query
(
"SELECT uid, name, mail FROM
{
users
}
WHERE status = 1 AND LOWER(
name
)
=
'%s'"
,
strtolower
(
$edit
[
'name'
])
));
$account
=
user_load
(
array
(
'
name
'
=
>
$edit
[
'name'
],
'status'
=>
1
));
if
(
!
$account
)
form_set_error
(
'name'
,
t
(
'Sorry. The username "<i>%s</i>" is not recognized.'
,
array
(
'%s'
=>
$edit
[
'name'
])));
}
else
if
(
$edit
[
'mail'
])
{
$account
=
db_fetch_object
(
db_query
(
"SELECT uid, name, mail FROM
{
users
}
WHERE status = 1 AND LOWER(
mail
)
=
'%s'"
,
strtolower
(
$edit
[
'mail'
])
));
$account
=
user_load
(
array
(
'
mail
'
=
>
$edit
[
'mail'
],
'status'
=>
1
));
if
(
!
$account
)
form_set_error
(
'name'
,
t
(
'Sorry. The e-mail address "<i>%s</i>" is not recognized.'
,
array
(
'%s'
=>
$edit
[
'mail'
])));
}
if
(
$account
)
{
...
...
@@ -896,7 +896,7 @@ function user_pass($edit = array()) {
$pass
=
user_password
();
// Save new password:
user_save
(
$account
,
array
(
'pass'
=>
$pass
));
user_save
(
$account
,
array_merge
(
object2array
(
$account
),
array
(
'pass'
=>
$pass
))
)
;
// Mail new password:
$variables
=
array
(
'%username'
=>
$account
->
name
,
'%site'
=>
variable_get
(
'site_name'
,
'drupal'
),
'%password'
=>
$pass
,
'%uri'
=>
$base_url
,
'%uri_brief'
=>
substr
(
$base_url
,
strlen
(
'http://'
)),
'%mailto'
=>
$account
->
mail
,
'%date'
=>
format_date
(
time
()),
'%login_uri'
=>
url
(
'user/login'
,
NULL
,
NULL
,
TRUE
),
'%edit_uri'
=>
url
(
'user/edit'
,
NULL
,
NULL
,
TRUE
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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