Просмотр исходного кода

keep_max disabled by default for existing installations (#2602)

https://github.com/FreshRSS/FreshRSS/issues/2600
Alexandre Alapetite 6 лет назад
Родитель
Сommit
b546d2d77d
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      app/Models/Context.php

+ 2 - 2
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;