[Dolibarr-git] [Dolibarr/dolibarr] 884b74: FIX: warning when adding ECM files using old photo...

[Laurent Destailleur]

  Branch: refs/heads/7.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 884b74a6bb322a44e129ea54cf77e4399ad54536
      
https://github.com/Dolibarr/dolibarr/commit/884b74a6bb322a44e129ea54cf77e4399ad54536
  Author: Marc de Lima Lucio <address@hidden>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php

  Log Message:
  -----------
  FIX: warning when adding ECM files using old photo path


  Commit: 6d0c4deb6e25c1cd2c81458e026d0733bb27800e
      
https://github.com/Dolibarr/dolibarr/commit/6d0c4deb6e25c1cd2c81458e026d0733bb27800e
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-08 (Thu, 08 Mar 2018)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php

  Log Message:
  -----------
  Merge pull request #8295 from ATM-Marc/FIX_product_photo_ecm

FIX: warning when adding ECM files using old photo path


  Commit: 3762ed12c731ab1f20f2495b6c7b6d2c7c752b7c
      
https://github.com/Dolibarr/dolibarr/commit/3762ed12c731ab1f20f2495b6c7b6d2c7c752b7c
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-08 (Thu, 08 Mar 2018)

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

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

Conflicts:
        htdocs/core/class/html.formfile.class.php


  Commit: af9fff4f83a0b5f51b26cfe7a6e902b443c8a19a
      
https://github.com/Dolibarr/dolibarr/commit/af9fff4f83a0b5f51b26cfe7a6e902b443c8a19a
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-08 (Thu, 08 Mar 2018)

  Changed paths:
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/facture/mod_facture_mars.php
    M htdocs/core/modules/facture/mod_facture_terre.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/343ca1bc777c...af9fff4f83a0