From e58ad65902ffb5d2fdbf34a2b63e383ec9919f4d Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 30 May 2020 22:48:00 +0200 Subject: Fix display_categories upgrade from 1.16.0 again (#3019) * Fix display_categories upgrade from 1.16.0 again #fix https://github.com/FreshRSS/FreshRSS/issues/3017 Follow-up of https://github.com/FreshRSS/FreshRSS/pull/3018 There were two bugs. I forgot that `ConfigurationSetter.php` is not called when reading `config.php` * Changelog 3019 --- app/Models/Context.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app') diff --git a/app/Models/Context.php b/app/Models/Context.php index e27330665..c5dcbdcdb 100644 --- a/app/Models/Context.php +++ b/app/Models/Context.php @@ -69,6 +69,11 @@ class FreshRSS_Context { } FreshRSS_Context::$user_conf->archiving = $archiving; } + + //Legacy < 1.16.1 + if (!in_array(FreshRSS_Context::$user_conf->display_categories, [ 'active', 'all', 'none' ], true)) { + FreshRSS_Context::$user_conf->display_categories = FreshRSS_Context::$user_conf->display_categories === true ? 'all' : 'active'; + } } /** -- cgit v1.2.3