Merge branch 'develop' into feature/settings

This commit is contained in:
slawkens
2021-06-08 22:06:21 +02:00
32 changed files with 229 additions and 2089 deletions

View File

@@ -167,7 +167,7 @@ else if (isset($_REQUEST['search'])) {
}
$lastDay = 0;
if ($p_days != 0 && $p_days != PHP_INT_MAX) {
if($p_days != 0 && $p_days != OTS_Account::GRATIS_PREMIUM_DAYS) {
$lastDay = time();
} else if ($lastDay != 0) {
$lastDay = 0;

View File

@@ -16,8 +16,6 @@ if (!file_exists(BASE . 'CHANGELOG.md')) {
return;
}
require LIBS . 'Parsedown.php';
$changelog = file_get_contents(BASE . 'CHANGELOG.md');
$Parsedown = new Parsedown();