Display a generic error page on initial DB/configuration errors (#8222)

1 files changed, 3 insertions, 8 deletions

diff --git a/index.php b/index.php
index a259ece9b..16128bc23 100644
--- a/index.php
+++ b/index.php
@@ -49,14 +49,9 @@ $RCMAIL->output->common_headers(!empty($_SESSION['user_id']));
 // turn on output buffering
 ob_start();
 
-// check if config files had errors
-if ($err_str = $RCMAIL->config->get_error()) {
-    rcmail::raise_error(['code' => 601, 'message' => $err_str], false, true);
-}
-
-// check DB connections and exit on failure
-if ($err_str = $RCMAIL->db->is_error()) {
-    rcmail::raise_error(['code' => 603, 'type' => 'db', 'message' => $err_str], false, true);
+// check the initial error state
+if ($RCMAIL->config->get_error() || $RCMAIL->db->is_error()) {
+    rcmail_fatal_error();
 }
 
 // error steps