Commit ea18b50d authored by Johan Cwiklinski's avatar Johan Cwiklinski

Merge branch '9.5/bugfixes'

parents e60e4fcf ecaf41bc
......@@ -176,6 +176,9 @@ class RuleImportEntity extends Rule {
$actions['groups_id_tech']['type'] = 'dropdown';
$actions['groups_id_tech']['table'] = 'glpi_groups';
$actions['users_id_tech']['name'] = __('Technician in charge of the hardware');
$actions['users_id_tech']['type'] = 'dropdown_users';
return $actions;
}
......
* ---------------------------------------------------------------------
* GLPI - Gestionnaire Libre de Parc Informatique
* Copyright (C) 2015-2018 Teclib' and contributors.
* Copyright (C) 2015-2019 Teclib' and contributors.
*
* http://glpi-project.org
*
......
......@@ -51,8 +51,8 @@ foreach (readdir(DIRHANDLE)){
}
} else {
if(!(-l "$dir/$_")){
# Included filetypes - php, css, js => default comment style
if ((index($_,".php",0)!=-1)||(index($_,".css",0)!=-1)||(index($_,".js",0)!=-1)){
# Included filetypes - php, css, js, scss => default comment style
if ((index($_,".php",0)!=-1)||(index($_,".css",0)!=-1)||(index($_,".scss",0)!=-1)||(index($_,".js",0)!=-1)){
do_file("$dir/$_", "");
}
# Included filetypes - sql, sh, pl => Add a specific comment style (#)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment