[Dolibarr-git] [Dolibarr/dolibarr] 8e68aa: problems with additionnal template type

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8e68aa86acd2297ed4f1bff6487dde4f9be83c1e
      
https://github.com/Dolibarr/dolibarr/commit/8e68aa86acd2297ed4f1bff6487dde4f9be83c1e
  Author: BENKE Charlie <address@hidden>
  Date:   2017-05-14 (Sun, 14 May 2017)

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

  Log Message:
  -----------
  problems with additionnal template type

If i active my new xml templater, and keep odt, the odt folder is added on 
folder to scan on my xml path
ex : 
odt folder defined : c:\toto
xml folder defined : c:\tata

folder scanned with odt :  c:\toto
folder scanned with odt :  c:\toto,c:\tata


  Commit: 92d7b907bed3f41df664fe6a803c3dbd698f3b79
      
https://github.com/Dolibarr/dolibarr/commit/92d7b907bed3f41df664fe6a803c3dbd698f3b79
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-05-18 (Thu, 18 May 2017)

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

  Log Message:
  -----------
  Merge pull request #6844 from defrance/patch-10

problems with additionnal template type


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7dbe3b1da97c...92d7b907bed3