[Dolibarr-git] [Dolibarr/dolibarr] abffd2: Try a fix for #6334, #6416

[Laurent Destailleur]

  Branch: refs/heads/5.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: abffd29179cac5686aa8e45fc5acc2f28368a233
      
https://github.com/Dolibarr/dolibarr/commit/abffd29179cac5686aa8e45fc5acc2f28368a233
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Try a fix for #6334, #6416


  Commit: 32b1f4261b7339553b6c4c8b176c8729d0212163
      
https://github.com/Dolibarr/dolibarr/commit/32b1f4261b7339553b6c4c8b176c8729d0212163
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0e6ba5df4e46...32b1f4261b73