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
b9f14bf6
Unverified
Commit
b9f14bf6
authored
3 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(msgPool) Improve siError formatting
issue #6172
parent
0be844f7
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
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/class_msgPool.inc
+1
-1
include/class_msgPool.inc
include/class_msg_dialog.inc
+1
-1
include/class_msg_dialog.inc
with
2 additions
and
2 deletions
+2
-2
include/class_msgPool.inc
+
1
−
1
View file @
b9f14bf6
...
...
@@ -569,7 +569,7 @@ class msgPool
if
(
$error
==
''
)
{
return
htmlescape
(
_
(
'Communication failure with the infrastructure service!'
));
}
return
sprintf
(
htmlescape
(
_
(
'
Communication failure with the infrastructure service: %s
'
)),
'<br/><br/>'
.
htmlescape
(
sprintf
(
_
(
'
Error: %s
'
),
$error
)));
return
nl2br
(
htmlescape
(
sprintf
(
_
(
"
Communication failure with the infrastructure service: %s
\n\n
Error: %s
"
),
$error
)));
}
/*!
...
...
This diff is collapsed.
Click to expand it.
include/class_msg_dialog.inc
+
1
−
1
View file @
b9f14bf6
...
...
@@ -116,7 +116,7 @@ class msg_dialog
*
* \param string|object $title The title of the message dialog, or the error object
*
* \param string $message The message of the message dialog
* \param string $message The message of the message dialog
(HTML)
*
* \param int $type The type of the message dialog, by default = INFO_DIALOG
*
...
...
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