[Dolibarr-git] [Dolibarr/dolibarr] ea7eb2: Close bug #2757 Deleting product category photo gi...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ea7eb241e36bd0f732df7466eecbeadbe10074a9
      
https://github.com/Dolibarr/dolibarr/commit/ea7eb241e36bd0f732df7466eecbeadbe10074a9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/photos.php

  Log Message:
  -----------
  Close bug #2757 Deleting product category photo gives "Forbidden access" error


  Commit: 190f12c4c4b962a14f633e0339b4e476c7446af4
      
https://github.com/Dolibarr/dolibarr/commit/190f12c4c4b962a14f633e0339b4e476c7446af4
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M ChangeLog
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Merge branch '3.5' into bug-2757

Conflicts:
        ChangeLog


  Commit: f8e8fe6f34829c3e585c1ed9439ee7c4aa7e1258
      
https://github.com/Dolibarr/dolibarr/commit/f8e8fe6f34829c3e585c1ed9439ee7c4aa7e1258
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M ChangeLog
    M htdocs/categories/photos.php

  Log Message:
  -----------
  Merge pull request #2816 from marcosgdf/bug-2757

Close bug #2757 Deleting product category photo gives "Forbidden access" error


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5f594d55acb8...f8e8fe6f3482