[Dolibarr-git] [Dolibarr/dolibarr] f2178f: FIX #4291 Correctly filter external calendar GETPO...

[Laurent Destailleur]

  Branch: refs/heads/3.8
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f2178f0369981dce326e4d67e44ae7493539d550
      
https://github.com/Dolibarr/dolibarr/commit/f2178f0369981dce326e4d67e44ae7493539d550
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M htdocs/admin/agenda_extsites.php

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


  Commit: 36dc8b1ce79c972c867b804778c5b780caea8a56
      
https://github.com/Dolibarr/dolibarr/commit/36dc8b1ce79c972c867b804778c5b780caea8a56
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  FIX #4341


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

  Changed paths:
    M htdocs/admin/agenda_extsites.php

  Log Message:
  -----------
  Merge pull request #4355 from GPCsolutions/3.6-4291

FIX #4291 Correctly filter external calendar GETPOSTs


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

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix sql injection even when code is on several lines


  Commit: 5414cb6f12ce4bf1d804d22b4ac5fe72e6eaf25f
      
https://github.com/Dolibarr/dolibarr/commit/5414cb6f12ce4bf1d804d22b4ac5fe72e6eaf25f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M htdocs/admin/agenda_extsites.php

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


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

  Changed paths:
    M htdocs/admin/agenda_extsites.php
    M htdocs/main.inc.php

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

Conflicts:
        htdocs/admin/agenda_extsites.php


  Commit: 8366310f0f098409d261841525659a85ff05d68f
      
https://github.com/Dolibarr/dolibarr/commit/8366310f0f098409d261841525659a85ff05d68f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-08 (Fri, 08 Jan 2016)

  Changed paths:
    M htdocs/admin/agenda_extsites.php
    M htdocs/main.inc.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into 3.8

Conflicts:
        htdocs/admin/agenda_extsites.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9d3afe45d389...8366310f0f09