mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-05-08 06:14:54 +02:00
issue #2158 check webmaster_id before load_conf_from_db
In Piwigo 15, configuration setting webmaster_id is moved from config files to database. It may be undefined at some point, with Piwigo 15+ scripts and a Piwigo 14 database schema not upgraded yet. Let's avoid any problem.
This commit is contained in:
@@ -124,6 +124,11 @@ catch (Exception $e)
|
||||
|
||||
pwg_db_check_charset();
|
||||
|
||||
// in Piwigo 15, configuration setting webmaster_id is moved from config files
|
||||
// to database. It may be undefined at some point, with Piwigo 15+ scripts and
|
||||
// a Piwigo 14 database schema not upgraded yet. Let's avoid any problem.
|
||||
$conf['webmaster_id'] = $conf['webmaster_id'] ?? 1;
|
||||
|
||||
load_conf_from_db();
|
||||
|
||||
$logger = new Logger(array(
|
||||
|
||||
Reference in New Issue
Block a user