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
a6e7e9c1
Commit
a6e7e9c1
authored
Jan 14, 2005
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Patch
#15566
by drumm: must specify a userneme or password error happens when it shouldn't.
parent
bf3c1370
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 @
a6e7e9c1
...
...
@@ -914,9 +914,6 @@ function user_pass() {
else
if
(
$edit
[
'mail'
]
&&
!
(
$account
=
user_load
(
array
(
'mail'
=>
$edit
[
'mail'
],
'status'
=>
1
))))
{
form_set_error
(
'mail'
,
t
(
'Sorry. The e-mail address %email is not recognized.'
,
array
(
'%email'
=>
'<em>'
.
$edit
[
'mail'
]
.
'</em>'
)));
}
else
if
(
$edit
)
{
drupal_set_message
(
t
(
'You must provider either a username or e-mail address.'
),
'error'
);
}
if
(
$account
)
{
$from
=
variable_get
(
'site_mail'
,
ini_get
(
'sendmail_from'
));
$pass
=
user_password
();
...
...
@@ -942,6 +939,9 @@ function user_pass() {
drupal_goto
(
'user'
);
}
else
{
if
(
$edit
)
{
drupal_set_message
(
t
(
'You must provider either a username or e-mail address.'
),
'error'
);
}
// Display form:
$output
=
'<p>'
.
t
(
'Enter your username <strong><em>or</em></strong> your e-mail address.'
)
.
'</p>'
;
$output
.
=
form_textfield
(
t
(
'Username'
),
'name'
,
$edit
[
'name'
],
30
,
64
);
...
...
modules/user/user.module
View file @
a6e7e9c1
...
...
@@ -914,9 +914,6 @@ function user_pass() {
else
if
(
$edit
[
'mail'
]
&&
!
(
$account
=
user_load
(
array
(
'mail'
=>
$edit
[
'mail'
],
'status'
=>
1
))))
{
form_set_error
(
'mail'
,
t
(
'Sorry. The e-mail address %email is not recognized.'
,
array
(
'%email'
=>
'<em>'
.
$edit
[
'mail'
]
.
'</em>'
)));
}
else
if
(
$edit
)
{
drupal_set_message
(
t
(
'You must provider either a username or e-mail address.'
),
'error'
);
}
if
(
$account
)
{
$from
=
variable_get
(
'site_mail'
,
ini_get
(
'sendmail_from'
));
$pass
=
user_password
();
...
...
@@ -942,6 +939,9 @@ function user_pass() {
drupal_goto
(
'user'
);
}
else
{
if
(
$edit
)
{
drupal_set_message
(
t
(
'You must provider either a username or e-mail address.'
),
'error'
);
}
// Display form:
$output
=
'<p>'
.
t
(
'Enter your username <strong><em>or</em></strong> your e-mail address.'
)
.
'</p>'
;
$output
.
=
form_textfield
(
t
(
'Username'
),
'name'
,
$edit
[
'name'
],
30
,
64
);
...
...
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