diff options
| author | Greg Roach <fisharebest@gmail.com> | 2016-01-14 11:24:00 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2016-01-14 11:24:00 +0000 |
| commit | 89cbc794495b4b7b9eb313abdc8e609cb9a37f9f (patch) | |
| tree | 96b6d1cc8e2db69192af6a45e2b56f2ce3ee8647 | |
| parent | d1024aca7ba5b26f73c4eeef9b2580a59ce9f60e (diff) | |
| download | webtrees-89cbc794495b4b7b9eb313abdc8e609cb9a37f9f.tar.gz webtrees-89cbc794495b4b7b9eb313abdc8e609cb9a37f9f.tar.bz2 webtrees-89cbc794495b4b7b9eb313abdc8e609cb9a37f9f.zip | |
Fix - database errors during setup are not displayed
| -rw-r--r-- | site-unavailable.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/site-unavailable.php b/site-unavailable.php index 8b6b94fb89..8c5b973589 100644 --- a/site-unavailable.php +++ b/site-unavailable.php @@ -29,13 +29,6 @@ define('WT_ROOT', ''); define('WT_DATA_DIR', realpath('data') . DIRECTORY_SEPARATOR); define('WT_MODULES_DIR', 'modules_v3/'); -// No configuration file? Start the setup wizard -if (!file_exists(WT_DATA_DIR . 'config.ini.php')) { - header('Location: setup.php'); - - return; -} - require 'vendor/autoload.php'; Session::start(); @@ -53,7 +46,7 @@ foreach (FlashMessages::getMessages() as $message) { } // If we can't connect to the database at all, give the reason why -$config_ini_php = parse_ini_file('data/config.ini.php'); +$config_ini_php = file_exists('data/config.ini.php') && parse_ini_file('data/config.ini.php'); if (is_array($config_ini_php) && array_key_exists('dbhost', $config_ini_php) && array_key_exists('dbport', $config_ini_php) && array_key_exists('dbuser', $config_ini_php) && array_key_exists('dbpass', $config_ini_php) && array_key_exists('dbname', $config_ini_php)) { try { new PDO('mysql:host=' . $config_ini_php['dbhost'] . ';port=' . $config_ini_php['dbport'] . ';dbname=' . $config_ini_php['dbname'], $config_ini_php['dbuser'], $config_ini_php['dbpass'], array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_OBJ, PDO::ATTR_CASE => PDO::CASE_LOWER, PDO::ATTR_AUTOCOMMIT => true)); |