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

Minor fix

Browse Source
This commit is contained in:
Laurent Destailleur 2018-12-06 19:29:11 +01:00
parent 6d093b03f6
commit 30abedbcbd
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/install/upgrade2.php
View File

@ -4848,16 +4848,20 @@ function migrate_user_photospath()
{ {
while ($obj = $db->fetch_object($resql)) while ($obj = $db->fetch_object($resql))
{ {
print '.';
$fuser->fetch($obj->uid); $fuser->fetch($obj->uid);
//echo '<hr>'.$fuser->id.' -> '.$fuser->entity; //echo '<hr>'.$fuser->id.' -> '.$fuser->entity;
$entity = (!empty($fuser->entity)) ? $fuser->entity : 1; $entity = (empty($fuser->entity) ? 1 : $fuser->entity);
if ($entity > 1) { if ($entity > 1) {
$dir = DOL_DATA_ROOT . '/' . $entity . '/users'; $dir = DOL_DATA_ROOT . '/' . $entity . '/users';
} else { } else {
$dir = $conf->user->multidir_output[$entity]; // $conf->user->multidir_output[] for each entity is construct by the multicompany module $dir = $conf->user->multidir_output[$entity]; // $conf->user->multidir_output[] for each entity is construct by the multicompany module
} }
if ($dir)
{
$origin = $dir .'/'. get_exdir($fuser->id,2,0,0,$fuser,'user'); $origin = $dir .'/'. get_exdir($fuser->id,2,0,0,$fuser,'user');
$destin = $dir.'/'.$fuser->id; $destin = $dir .'/'. $fuser->id;
$error = 0; $error = 0;
@ -4895,6 +4899,7 @@ function migrate_user_photospath()
} }
} }
} }
}
} }
} }