Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
082b1f2b
Unverified
Commit
082b1f2b
authored
5 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(recovery) Fix bad error message when mail sending fails
issue #5997
parent
d93a823b
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/class_passwordRecovery.inc
+2
-2
include/class_passwordRecovery.inc
with
2 additions
and
2 deletions
+2
-2
include/class_passwordRecovery.inc
+
2
−
2
View file @
082b1f2b
...
@@ -349,7 +349,7 @@ class passwordRecovery extends standAlonePage
...
@@ -349,7 +349,7 @@ class passwordRecovery extends standAlonePage
if
(
mail_utf8
(
$this
->
email_address
,
FALSE
,
$this
->
from_mail
,
$this
->
mail_subject
,
$body
))
{
if
(
mail_utf8
(
$this
->
email_address
,
FALSE
,
$this
->
from_mail
,
$this
->
mail_subject
,
$body
))
{
$this
->
step
=
3
;
$this
->
step
=
3
;
}
else
{
}
else
{
$this
->
message
[]
=
msgPool
::
invalid
(
_
(
"
Contact your administrator, there was a problem with mail server
"
)
);
$this
->
message
[]
=
_
(
'
Contact your administrator, there was a problem with mail server
'
);
}
}
$smarty
=
get_smarty
();
$smarty
=
get_smarty
();
...
@@ -426,7 +426,7 @@ class passwordRecovery extends standAlonePage
...
@@ -426,7 +426,7 @@ class passwordRecovery extends standAlonePage
$this
->
step
=
5
;
$this
->
step
=
5
;
$smarty
->
assign
(
'changed'
,
TRUE
);
$smarty
->
assign
(
'changed'
,
TRUE
);
}
else
{
}
else
{
$this
->
message
[]
=
msgPool
::
invalid
(
_
(
"
There was a problem with mail server, confirmation email not sent
"
)
);
$this
->
message
[]
=
_
(
'
There was a problem with mail server, confirmation email not sent
'
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
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!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets