diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-22 23:03:16 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-08-22 23:03:16 +0200 |
commit | 79efca1e6ff28362d4bd2713f68205294cdd07de (patch) | |
tree | c20482071f97b5ba0f075d59a9a097b08b26b910 /src/Wallabag/CoreBundle/Form | |
parent | 9c545fe028013b30417c1a932cd6b9027bff752d (diff) | |
parent | 80bb0b73445092c4aa3e94f90cc5f8667fa123ba (diff) | |
download | wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.tar.gz wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.tar.zst wallabag-79efca1e6ff28362d4bd2713f68205294cdd07de.zip |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'src/Wallabag/CoreBundle/Form')
-rw-r--r-- | src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/ConfigType.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php index b712ad15..cb4bee83 100644 --- a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php +++ b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php | |||
@@ -16,7 +16,7 @@ class StringToListTransformer implements DataTransformerInterface | |||
16 | private $separator; | 16 | private $separator; |
17 | 17 | ||
18 | /** | 18 | /** |
19 | * @param string $separator The separator used in the list. | 19 | * @param string $separator The separator used in the list |
20 | */ | 20 | */ |
21 | public function __construct($separator = ',') | 21 | public function __construct($separator = ',') |
22 | { | 22 | { |
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index 74c53bf0..7d25cc80 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php | |||
@@ -21,7 +21,9 @@ class ConfigType extends AbstractType | |||
21 | { | 21 | { |
22 | $this->themes = array_combine( | 22 | $this->themes = array_combine( |
23 | $themes, | 23 | $themes, |
24 | array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes) | 24 | array_map(function ($s) { |
25 | return ucwords(strtolower(str_replace('-', ' ', $s))); | ||
26 | }, $themes) | ||
25 | ); | 27 | ); |
26 | 28 | ||
27 | $this->languages = $languages; | 29 | $this->languages = $languages; |