diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php index 86d3823aa6..a7a40ad75e 100644 --- a/core/install/install_first_time.php +++ b/core/install/install_first_time.php @@ -45,7 +45,7 @@ require_once "resources/classes/text.php"; $db_name = ''; $db_username = ''; $db_password = ''; - $db_create_option = 'none'; + $db_create = ''; $db_create_username = ''; $db_create_password = ''; diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php index 93258ffd6d..75c69bb264 100644 --- a/core/install/resources/classes/install_switch.php +++ b/core/install/resources/classes/install_switch.php @@ -50,12 +50,12 @@ include "root.php"; $this->domain = $domain_name; $this->detect_switch = $detect_switch; if (is_dir("/etc/fusionpbx")){ - $config = "/etc/fusionpbx/config.lua"; + $this->config_lua = "/etc/fusionpbx/config.lua"; } elseif (is_dir("/usr/local/etc/fusionpbx")){ - $config = "/usr/local/etc/fusionpbx/config.lua"; + $this->config_lua = "/usr/local/etc/fusionpbx/config.lua"; } else { - $config = $_SESSION['switch']['scripts']['dir']."/resources/config.lua"; + $this->config_lua = $_SESSION['switch']['scripts']['dir']."/resources/config.lua"; } $this->config_lua = normalize_path_to_os($this->config_lua); }