diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 6b55705c234..41a9ea0734d 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -1024,7 +1024,7 @@ foreach ($fieldlist as $field => $value) {
print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), array(), '0', 0, 0, '', 0, '', 'maxwidth100', 1);
print '';
} elseif ($value == 'topic') {
- print '
| ';
+ print ' | ';
} elseif ($value == 'type_template') {
print '';
// @phan-suppress-next-line PhanPluginSuspiciousParamOrder
@@ -1594,7 +1594,7 @@ function fieldList($fieldlist, $obj = null, $tabname = '', $context = '')
}
print ' | ';
- if ($value == 'private' && $context != 'preview') {
+ if (in_array($value, array('defaultfortype', 'private')) && $context != 'preview') {
if (empty($user->admin)) {
// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
print $form->selectyesno($value, GETPOSTISSET($value) ? GETPOSTINT($value) : (($context != 'add' && isset($obj->$value)) ? $obj->$value : '1'), 1, false, 0, 1);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b4f272abcec..71c5e0e4f5d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -10735,7 +10735,7 @@ class Form
* @param string $labelno Label for No
* @return string See option
*/
- public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0, $addjscombo = 0, $morecss = 'width75', $labelyes = 'Yes', $labelno = 'No')
+ public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0, $addjscombo = 0, $morecss = 'yesno width75', $labelyes = 'Yes', $labelno = 'No')
{
global $langs;
|