diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2020-05-30 22:48:00 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-05-30 22:48:00 +0200 |
| commit | e58ad65902ffb5d2fdbf34a2b63e383ec9919f4d (patch) | |
| tree | 356466325b2974d328ad5b927212272869c22664 | |
| parent | b4649b640fe19dffb951ddb3ea52d4256cd2f1c4 (diff) | |
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
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | app/Models/Context.php | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b70ba7c1d..c2b3b5788 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## 2020-XX-XX FreshRSS 1.16.2-dev * Bug fixing - * Fix migration of the preference *Show categories unfolded by default* (from ≤ 1.16.0) to the new *Categories to unfold* [#3018](https://github.com/FreshRSS/FreshRSS/pull/3018) + * Fix migration of the preference *Show categories unfolded by default* (from ≤ 1.16.0) to the new *Categories to unfold* [#3019](https://github.com/FreshRSS/FreshRSS/pull/3019) ## 2020-05-30 FreshRSS 1.16.1 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'; + } } /** |