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.
Piwigo · Jun 12, 2024 · e6f17ef · e6f17ef
1 parent badc7c7
commit e6f17ef
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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(