[Dolibarr-git] [Dolibarr/dolibarr] 0814fa: FIX CVE CVE-2015-8685

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0814fa76f870b3afaa1559ca648769453e5fbb03
      
https://github.com/Dolibarr/dolibarr/commit/0814fa76f870b3afaa1559ca648769453e5fbb03
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  FIX CVE CVE-2015-8685


  Commit: ed16699de65f7c4799aa2c5cae1d035d92f3adc9
      
https://github.com/Dolibarr/dolibarr/commit/ed16699de65f7c4799aa2c5cae1d035d92f3adc9
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M htdocs/admin/agenda_extsites.php

  Log Message:
  -----------
  FIX #4291 Correctly filter external calendar GETPOSTs


  Commit: c1b6630c16af823b94e4a95de425b98bef58412f
      
https://github.com/Dolibarr/dolibarr/commit/c1b6630c16af823b94e4a95de425b98bef58412f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        htdocs/main.inc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9fd56df03fd6...c1b6630c16af