diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-10-26 17:51:23 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-10-26 17:51:23 +0200 |
| commit | b546d2d77d00af3d6cabb01f6d74535a0390f257 (patch) | |
| tree | 8306977805d863ff56d16d1336a3e3c114466923 /app/Models/Context.php | |
| parent | 112572a03fb9fb78ba9c846be50302f9f996c3ad (diff) | |
keep_max disabled by default for existing installations (#2602)
https://github.com/FreshRSS/FreshRSS/issues/2600
Diffstat (limited to 'app/Models/Context.php')
| -rw-r--r-- | app/Models/Context.php | 4 |
1 files changed, 2 insertions, 2 deletions
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; |