From b546d2d77d00af3d6cabb01f6d74535a0390f257 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 26 Oct 2019 17:51:23 +0200 Subject: keep_max disabled by default for existing installations (#2602) https://github.com/FreshRSS/FreshRSS/issues/2600 --- app/Models/Context.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/Models/Context.php') diff --git a/app/Models/Context.php b/app/Models/Context.php index 878b72c69..bfc4299c9 100644 --- a/app/Models/Context.php +++ b/app/Models/Context.php @@ -59,13 +59,13 @@ class FreshRSS_Context { } $keepMin = (int)FreshRSS_Context::$user_conf->param('keep_history_default', -5); - if ($keepMin != 0 && $keepMin > -5) { //Freshrss < 1.15 + if ($keepMin > -5) { //Freshrss < 1.15 $archiving = FreshRSS_Context::$user_conf->archiving; + $archiving['keep_max'] = false; if ($keepMin > 0) { $archiving['keep_min'] = $keepMin; } elseif ($keepMin == -1) { //Infinite $archiving['keep_period'] = false; - $archiving['keep_max'] = false; $archiving['keep_min'] = false; } FreshRSS_Context::$user_conf->archiving = $archiving; -- cgit v1.2.3