Fix for DB upgrade process when using env vars instead of settings.php

craigk5n · Sep 5, 2023 · d0572ba · d0572ba
1 parent cda051c
commit d0572ba
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/install/index.php b/install/index.php
@@ -318,15 +318,14 @@
 
 // We're doing a database installation yea ha!
 if( ! empty( $action ) && $action == 'install' ) {
-  // We'll grab database settings from settings.php.
-  $db_database = $settings['db_database'];
-  $db_host     = $settings['db_host'];
-  $db_login    = $settings['db_login'];
-  $db_password = ( empty( $settings['db_password'] )
-    ? '' : $settings['db_password'] );
+  // We'll grab database settings from settings.php or from env vars
+  $db_database = $use_env ? getenv('WEBCALENDAR_DB_DATABASE') : $settings['db_database'];
+  $db_host = $use_env ? getenv('WEBCALENDAR_DB_HOST') : $settings['db_host'];
+  $db_login = $use_env ? getenv('WEBCALENDAR_DB_LOGIN') : $settings['db_login'];
+  $db_password = $use_env ? getenv('WEBCALENDAR_DB_PASSWORD') : $settings['db_password'];
   $db_persistent = false;
-  $db_type       = $settings['db_type'];
-  $real_db       = ( $db_type== 'sqlite' || $db_type == 'sqlite3'
+  $db_type = $use_env ? getenv('WEBCALENDAR_DB_TYPE') : $settings['db_type'];
+  $real_db = ( $db_type== 'sqlite' || $db_type == 'sqlite3'
     ? get_full_include_path( $db_database ) : $db_database );
 
   // We might be displaying SQL only.