diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-06-23 11:47:46 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-06-23 11:47:46 +0200 |
commit | f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4 (patch) | |
tree | 156b1a29cfbe1962e68d409c3dea5a3911a34e9c /src/Wallabag/CoreBundle/Form/Type/ConfigType.php | |
parent | 49e2854d5c15bbce3f24f91da34450e8f209295b (diff) | |
parent | fb5c17a9ab5e10b1de9caa50e73638fdae19cb78 (diff) | |
download | wallabag-f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4.tar.gz wallabag-f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4.tar.zst wallabag-f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4.zip |
Merge branch 'master' into 2.1
Diffstat (limited to 'src/Wallabag/CoreBundle/Form/Type/ConfigType.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/ConfigType.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index 4cf22200..74c53bf0 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php | |||
@@ -32,7 +32,6 @@ class ConfigType extends AbstractType | |||
32 | $builder | 32 | $builder |
33 | ->add('theme', ChoiceType::class, [ | 33 | ->add('theme', ChoiceType::class, [ |
34 | 'choices' => array_flip($this->themes), | 34 | 'choices' => array_flip($this->themes), |
35 | 'choices_as_values' => true, | ||
36 | 'label' => 'config.form_settings.theme_label', | 35 | 'label' => 'config.form_settings.theme_label', |
37 | ]) | 36 | ]) |
38 | ->add('items_per_page', null, [ | 37 | ->add('items_per_page', null, [ |
@@ -49,7 +48,6 @@ class ConfigType extends AbstractType | |||
49 | ]) | 48 | ]) |
50 | ->add('language', ChoiceType::class, [ | 49 | ->add('language', ChoiceType::class, [ |
51 | 'choices' => array_flip($this->languages), | 50 | 'choices' => array_flip($this->languages), |
52 | 'choices_as_values' => true, | ||
53 | 'label' => 'config.form_settings.language_label', | 51 | 'label' => 'config.form_settings.language_label', |
54 | ]) | 52 | ]) |
55 | ->add('save', SubmitType::class, [ | 53 | ->add('save', SubmitType::class, [ |