mirror/litebans-php
1
0
Fork 0
mirror of https://gitlab.com/ruany/litebans-php.git synced 2025-05-23 16:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert settings.php cleanup from last commit

Browse Source 
Intellij diff highlighting broke for some reason.
This commit is contained in:
ruan 2018-10-11 05:06:04 +02:00
parent 4b85ad4f81
commit d4da4a8e22
No known key found for this signature in database
GPG Key ID: 0D2EC1C52E469C0B
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
inc/settings.php
View File

@ -231,26 +231,24 @@ final class Settings {
redirect("error/outdated-plugin.php"); redirect("error/outdated-plugin.php");
} }
} }
if ($settings->error_reporting === false) { if ($settings->error_reporting) {
die("Database error: $message");
} else {
die("Database error"); die("Database error");
} }
die("Database error: $message");
} }
private function test_strftime() { private function test_strftime() {
// If you modify this function, you may get an "Assertion failed" error. // If you modify this function, you may get an "Assertion failed" error.
date_default_timezone_set("UTC"); // temporarily set UTC timezone for testing purposes date_default_timezone_set("UTC"); // temporarily set UTC timezone for testing purposes
$fail = false;
$test = gmstrftime($this->date_format, 0); $test = gmstrftime($this->date_format, 0);
if ($test == false) { if ($test == false) {
ob_start(); ob_start();
var_dump($test); var_dump($test);
$testdump = ob_get_clean(); $testdump = ob_get_clean();
echo("Error: date_format test failed. gmstrftime(\"" . $this->date_format . "\",0) returned $testdump"); die("Error: date_format test failed. gmstrftime(\"" . $this->date_format . "\",0) returned $testdump");
$fail = true;
} }
$test = gmstrftime("%Y-%m-%d %H:%M", 0); $test = gmstrftime("%Y-%m-%d %H:%M", 0);
@ -258,13 +256,7 @@ final class Settings {
ob_start(); ob_start();
var_dump($test); var_dump($test);
$testdump = ob_get_clean(); $testdump = ob_get_clean();
echo("Assertion failed: gmstrftime(\"%Y-%m-%d %H:%M\",0) != \"1970-01-01 00:00\"<br>"); die("Assertion failed: gmstrftime(\"%Y-%m-%d %H:%M\",0) != \"1970-01-01 00:00\"<br>Actual result: $testdump");
echo("Actual result: $testdump");
$fail = true;
}
if ($fail === true) {
die;
} }
} }
} }