[Dolibarr-git] [Dolibarr/dolibarr] 7b5125: FIX XSS

[Laurent Destailleur]

  Branch: refs/heads/10.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7b512587aadc3eca9e3565eed17f46c36498c643
      
https://github.com/Dolibarr/dolibarr/commit/7b512587aadc3eca9e3565eed17f46c36498c643
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-18 (Wed, 18 Sep 2019)

  Changed paths:
    M htdocs/admin/mails_templates.php

  Log Message:
  -----------
  FIX XSS


  Commit: 345ac28c8999d53ed541fb14cd08f4692e21aec6
      
https://github.com/Dolibarr/dolibarr/commit/345ac28c8999d53ed541fb14cd08f4692e21aec6
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-18 (Wed, 18 Sep 2019)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M htdocs/main.inc.php
    M htdocs/user/group/card.php

  Log Message:
  -----------
  Fix js injection

Conflicts:
        htdocs/core/lib/functions.lib.php
        htdocs/user/group/card.php


  Commit: 771104bc6882cd5c7c0c8545b9d7c1650321d5c5
      
https://github.com/Dolibarr/dolibarr/commit/771104bc6882cd5c7c0c8545b9d7c1650321d5c5
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-18 (Wed, 18 Sep 2019)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  Fix XSS


  Commit: e52788eb75d6a1ebb56b3a78271f14bbb209abb3
      
https://github.com/Dolibarr/dolibarr/commit/e52788eb75d6a1ebb56b3a78271f14bbb209abb3
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-18 (Wed, 18 Sep 2019)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  Fix xss


  Commit: 00d5cff00dcb03949948d494573b119b23f22f0c
      
https://github.com/Dolibarr/dolibarr/commit/00d5cff00dcb03949948d494573b119b23f22f0c
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-18 (Wed, 18 Sep 2019)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix XSS injection into textarea


  Commit: 9bf387d43cb81e08afbb70761d5c2fb624c6abb1
      
https://github.com/Dolibarr/dolibarr/commit/9bf387d43cb81e08afbb70761d5c2fb624c6abb1
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-18 (Wed, 18 Sep 2019)

  Changed paths:
    M htdocs/admin/mails_templates.php
    M htdocs/main.inc.php
    M htdocs/user/card.php

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

Conflicts:
        htdocs/admin/mails_templates.php
        htdocs/main.inc.php
        htdocs/user/card.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ad3d21578caa...9bf387d43cb8