From 24936479f988657b2a6cf6d3a1936df5ffa86789 Mon Sep 17 00:00:00 2001
From: ruan <ruany@users.noreply.github.com>
Date: Fri, 9 Sep 2016 19:45:00 +0200
Subject: [PATCH] Avoid showing any errors if error reporting is disabled

---
 inc/settings.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/inc/settings.php b/inc/settings.php
index 503a3d2..6efad5c 100644
--- a/inc/settings.php
+++ b/inc/settings.php
@@ -66,7 +66,7 @@ final class Settings {
         date_default_timezone_set("UTC");
 
         // Enable PHP error reporting.
-        $error_reporting = true;
+        $this->error_reporting = true;
 
         // Enable error pages.
         $this->error_pages = true;
@@ -76,7 +76,7 @@ final class Settings {
 
         /** Don't modify anything here unless you know what you're doing **/
 
-        if ($error_reporting) {
+        if ($this->error_reporting) {
             error_reporting(E_ALL);
             ini_set("display_errors", 1);
         }
@@ -141,7 +141,11 @@ final class Settings {
         $message = $e->getMessage();
         if ($settings->error_pages) {
             if (strstr($message, "Access denied for user")) {
-                $settings->redirect("error/access-denied.php?error=" . base64_encode($message));
+                if ($settings->error_reporting) {
+                    $settings->redirect("error/access-denied.php?error=" . base64_encode($message));
+                } else {
+                    $settings->redirect("error/access-denied.php");
+                }
             }
             if (strstr($message, "Base table or view not found:")) {
                 $settings->redirect("error/tables-not-found.php");
@@ -150,6 +154,9 @@ final class Settings {
                 $settings->redirect("error/outdated-plugin.php");
             }
         }
+        if ($settings->error_reporting === false) {
+            die("Database error");
+        }
         die('Database error: ' . $message);
     }