lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-05 12:24:27 +02:00
commit 233a7f1022
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/html.formticket.class.php
View File

@ -124,8 +124,9 @@ class FormTicket
/** /**
* Show the form to input ticket * Show the form to input ticket
* *
* @param int $withdolfichehead With dol_fiche_head * @param int $withdolfichehead With dol_fiche_head
* @return void * @param string Mode ('create' or 'edit')
* @return void
*/ */
public function showForm($withdolfichehead = 0, $mode = 'edit') public function showForm($withdolfichehead = 0, $mode = 'edit')
{ {

2
scripts/user/migrate_picture_path.php
View File

@ -83,6 +83,7 @@ $db->close(); // Close $db database opened handler
exit($error); exit($error);
/** /**
* Migrate file from old path to new one for user $u * Migrate file from old path to new one for user $u
* *
@ -105,7 +106,6 @@ function migrate_user_filespath($u)
dol_mkdir($destin); dol_mkdir($destin);
if (dol_is_dir($origin)) { if (dol_is_dir($origin)) {
$handle = opendir($origin_osencoded); $handle = opendir($origin_osencoded);
if (is_resource($handle)) { if (is_resource($handle)) {
while (($file = readdir($handle)) !== false) { while (($file = readdir($handle)) !== false) {