Merge remote-tracking branch 'origin/master' into 2.5.0

2022-05-13 13:50:50 +02:00
parent 49d5f27cd0 e1957c08e4
commit 4947ea6758
106 changed files with 2100 additions and 1461 deletions
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@ -24,7 +24,13 @@ class ConfigType extends AbstractType
        $this->themes = array_combine(
            $themes,
            array_map(function ($s) {
-                return ucwords(strtolower(str_replace('-', ' ', $s)));
+                $cleanTheme = ucwords(strtolower(str_replace('-', ' ', $s)));
+
+                if ('Baggy' === $cleanTheme) {
+                    $cleanTheme = 'Baggy (DEPRECATED)';
+                }
+
+                return $cleanTheme;
            }, $themes)
        );