diff --git a/include/common.inc.php b/include/common.inc.php index 6d88c59e56..3b63cdf04a 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -124,6 +124,11 @@ function sanitize_mysql_kv(&$v, $k) 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(