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

Merge pull request #20816 from hregis/fix_missing_loading_global_conf

Browse Source 
FIX missing loading of global conf (avoid warning)
This commit is contained in:
Laurent Destailleur 2022-05-10 14:47:56 +02:00 committed by GitHub
commit fff9a692b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;
// Load global conf
$conf->setValues($db);
$listofentities = array(1);
@ -4621,7 +4624,7 @@ function migrate_user_photospath2()
if ($entity > 1) {
$dir = DOL_DATA_ROOT.'/'.$entity.'/users';
} 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) {