First part of fix for #4147 


git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@22273 35612d4c-9d10-0410-837c-bf9dd1be60d7
complete fix for #4147


git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@22274 35612d4c-9d10-0410-837c-bf9dd1be60d7