pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

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

Browse Source
This commit is contained in:
Jeremy Benoist
2016-08-22 23:03:16 +02:00
parent 9c545fe028 80bb0b7344
commit 79efca1e6f
45 changed files with 494 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php
View File

@ -16,7 +16,7 @@ class StringToListTransformer implements DataTransformerInterface
private $separator;
/**
* @param string $separator The separator used in the list.
* @param string $separator The separator used in the list
*/
public function __construct($separator = ',')
{

4
src/Wallabag/CoreBundle/Form/Type/ConfigType.php
View File

@ -21,7 +21,9 @@ class ConfigType extends AbstractType
{
$this->themes = array_combine(
$themes,
array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes)
array_map(function ($s) {
return ucwords(strtolower(str_replace('-', ' ', $s)));
}, $themes)
);
$this->languages = $languages;