revert r22683 + real fix


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