From 4b85ad4f813b8b68889ed3061da7fcc2d314d622 Mon Sep 17 00:00:00 2001
From: ruan <ruany@users.noreply.github.com>
Date: Thu, 11 Oct 2018 04:58:53 +0200
Subject: [PATCH] Revert "Use faster query to fetch entry counts"

This reverts commit 95bdf49
---
 inc/header.php   |  8 ++++----
 inc/settings.php | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/inc/header.php b/inc/header.php
index 654c3a0..192b058 100644
--- a/inc/header.php
+++ b/inc/header.php
@@ -14,10 +14,10 @@ function __construct($page) {
         $t_kicks = $t['kicks'];
         try {
             $st = $page->conn->query("SELECT
-            (SELECT id FROM $t_bans ORDER BY id DESC LIMIT 1),
-            (SELECT id FROM $t_mutes ORDER BY id DESC LIMIT 1),
-            (SELECT id FROM $t_warnings ORDER BY id DESC LIMIT 1),
-            (SELECT id FROM $t_kicks ORDER BY id DESC LIMIT 1)");
+            (SELECT COUNT(*) FROM $t_bans),
+            (SELECT COUNT(*) FROM $t_mutes),
+            (SELECT COUNT(*) FROM $t_warnings),
+            (SELECT COUNT(*) FROM $t_kicks)");
             ($row = $st->fetch(PDO::FETCH_NUM)) or die('Failed to fetch row counts.');
             $st->closeCursor();
             $this->count = array(
diff --git a/inc/settings.php b/inc/settings.php
index cb042ed..121709c 100644
--- a/inc/settings.php
+++ b/inc/settings.php
@@ -231,24 +231,26 @@ final class Settings {
                 redirect("error/outdated-plugin.php");
             }
         }
-        if ($settings->error_reporting) {
-            die("Database error: $message");
-        } else {
+        if ($settings->error_reporting === false) {
             die("Database error");
         }
+        die("Database error: $message");
     }
 
 
+
     private function test_strftime() {
         // If you modify this function, you may get an "Assertion failed" error.
         date_default_timezone_set("UTC"); // temporarily set UTC timezone for testing purposes
 
+        $fail = false;
         $test = gmstrftime($this->date_format, 0);
         if ($test == false) {
             ob_start();
             var_dump($test);
             $testdump = ob_get_clean();
-            die("Error: date_format test failed. gmstrftime(\"" . $this->date_format . "\",0) returned $testdump");
+            echo("Error: date_format test failed. gmstrftime(\"" . $this->date_format . "\",0) returned $testdump");
+            $fail = true;
         }
 
         $test = gmstrftime("%Y-%m-%d %H:%M", 0);
@@ -256,7 +258,13 @@ final class Settings {
             ob_start();
             var_dump($test);
             $testdump = ob_get_clean();
-            die("Assertion failed: gmstrftime(\"%Y-%m-%d %H:%M\",0) != \"1970-01-01 00:00\"<br>Actual result: $testdump");
+            echo("Assertion failed: gmstrftime(\"%Y-%m-%d %H:%M\",0) != \"1970-01-01 00:00\"<br>");
+            echo("Actual result: $testdump");
+            $fail = true;
+        }
+
+        if ($fail === true) {
+            die;
         }
     }
 }