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

FIX missing loading of global conf

Browse Source
This commit is contained in:
Regis Houssin 2022-05-10 14:03:09 +02:00
parent 1e8547dd44
commit 8692038be2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/install/upgrade2.php
View File

@ -167,6 +167,9 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
} }
$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey; $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
// Load global conf
$conf->setValues($db);
$listofentities = array(1); $listofentities = array(1);
@ -4616,7 +4619,7 @@ function migrate_user_photospath2()
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 = DOL_DATA_ROOT.'/users';
} }
if ($dir) { if ($dir) {