Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fusiondirectory
fusiondirectory
Commits
6e539aca
Commit
6e539aca
authored
Oct 10, 2018
by
Côme Chilliet
Browse files
Merge branch 'revert-
b899c872
' into '1.4-dev'
Revert "Merge branch… See merge request fusiondirectory/fd!421
parents
b899c872
9423b393
Changes
2
Hide whitespace changes
Inline
Side-by-side
ihtml/themes/breezy/msg_dialog.tpl
View file @
6e539aca
...
...
@@ -41,12 +41,12 @@
{
elseif
$i_Type
==
$smarty.const.INFO_DIALOG
||
$i_Type
==
$smarty.const.CONFIRM_DIALOG
}
<img
src=
"geticon.php?context=status&icon=dialog-information&size=32"
class=
"center"
alt=
"
{
t
}
Information
{/
t
}
"
/>
{/
if
}
{
$s_Title
|
escape
}
{
$s_Title
}
</h2>
</div>
<div
style=
"z-index:250;width:100%;"
>
{
$s_Message
|
escape
}
{
$s_Message
}
</div>
<div
class=
"plugbottom"
>
{
if
$s_Trace
!=
""
&&
$i_TraceCnt
!=
0
}
...
...
include/class_msg_dialog.inc
View file @
6e539aca
...
...
@@ -172,8 +172,8 @@ class msg_dialog
<img src="geticon.php?context=status&icon=dialog-error&size=32" alt="'
.
_
(
'Error'
)
.
'"/>
</td>
<td style="width:100%">
<b>'
.
htmlentities
(
$this
->
s_Title
,
ENT_COMPAT
,
'UTF-8'
)
.
'</b><br/>
'
.
htmlentities
(
$this
->
s_Message
,
ENT_COMPAT
,
'UTF-8'
)
.
'<br><br/>
<b>'
.
$this
->
s_Title
.
'</b><br/>
'
.
$this
->
s_Message
.
'<br><br/>
'
.
_
(
'Please fix the above error and reload the page.'
)
.
'
</td>
</tr>
...
...
Write
Preview
Supports
Markdown
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