Fix conflict

This commit is contained in:
wdammak 2019-02-15 05:32:01 +01:00 committed by GitHub
parent 4dc4a25bb5
commit fd4f82b1b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1110,8 +1110,7 @@ if ($action == 'create' || $action == 'adduserldap')
{ {
print '<tr><td>' . $form->editfieldkey('Categories', 'usercats', '', $object, 0) . '</td><td colspan="3">'; print '<tr><td>' . $form->editfieldkey('Categories', 'usercats', '', $object, 0) . '</td><td colspan="3">';
$cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1); $cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1);
print $form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), null, null, null, print $form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), null, null, null, null, '90%');
null, '90%' );
print "</td></tr>"; print "</td></tr>";
} }