Browse Source

Catch error in install (#2556)

Alexandre Alapetite 6 years ago
parent
commit
40686d68df
1 changed files with 7 additions and 1 deletions
  1. 7 1
      app/install.php

+ 7 - 1
app/install.php

@@ -158,7 +158,13 @@ function saveStep2() {
 		Minz_Configuration::register('system', DATA_PATH . '/config.php', FRESHRSS_PATH . '/config.default.php');
 		Minz_Configuration::register('system', DATA_PATH . '/config.php', FRESHRSS_PATH . '/config.default.php');
 		FreshRSS_Context::$system_conf = Minz_Configuration::get('system');
 		FreshRSS_Context::$system_conf = Minz_Configuration::get('system');
 
 
-		$ok = checkDb();
+		$ok = false;
+		try {
+			$ok = checkDb();
+		} catch (Exception $ex) {
+			$_SESSION['bd_error'] = $ex->getMessage();
+			$ok = false;
+		}
 		if (!$ok) {
 		if (!$ok) {
 			@unlink(join_path(DATA_PATH, 'config.php'));
 			@unlink(join_path(DATA_PATH, 'config.php'));
 		}
 		}