From 40686d68df629642be78a50a24a62dd6feaa699c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 5 Oct 2019 17:12:05 +0200
Subject: Catch error in install (#2556)

---
 app/install.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'app/install.php')

diff --git a/app/install.php b/app/install.php
index 92e07dd4f..366fb0cfc 100644
--- a/app/install.php
+++ b/app/install.php
@@ -158,7 +158,13 @@ function saveStep2() {
 		Minz_Configuration::register('system', DATA_PATH . '/config.php', FRESHRSS_PATH . '/config.default.php');
 		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) {
 			@unlink(join_path(DATA_PATH, 'config.php'));
 		}
-- 
cgit v1.2.3