diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-02-04 15:59:57 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-02-04 15:59:57 +0100 |
commit | e008c037f53324b931f027483f9f1053171109c5 (patch) | |
tree | 441c54eb946ffb53a161cad8f686ce7aff875abd /src/Wallabag/CoreBundle/Helper/EntriesExport.php | |
parent | 74f39b0952440fa0c55e5e8a2e1a8d2bbd3acfd7 (diff) | |
parent | 79b9e49d9464e9a67f6ee66fbf6f6c541b1a29f4 (diff) | |
download | wallabag-e008c037f53324b931f027483f9f1053171109c5.tar.gz wallabag-e008c037f53324b931f027483f9f1053171109c5.tar.zst wallabag-e008c037f53324b931f027483f9f1053171109c5.zip |
Merge pull request #1612 from wallabag/v2-settings-page
Settings page
Diffstat (limited to 'src/Wallabag/CoreBundle/Helper/EntriesExport.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/EntriesExport.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php index 31a80d6e..965a40b6 100644 --- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php +++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php | |||
@@ -8,6 +8,7 @@ use JMS\Serializer\SerializerBuilder; | |||
8 | use PHPePub\Core\EPub; | 8 | use PHPePub\Core\EPub; |
9 | use PHPePub\Core\Structure\OPF\DublinCore; | 9 | use PHPePub\Core\Structure\OPF\DublinCore; |
10 | use Symfony\Component\HttpFoundation\Response; | 10 | use Symfony\Component\HttpFoundation\Response; |
11 | use Craue\ConfigBundle\Util\Config; | ||
11 | 12 | ||
12 | /** | 13 | /** |
13 | * This class doesn't have unit test BUT it's fully covered by a functional test with ExportControllerTest. | 14 | * This class doesn't have unit test BUT it's fully covered by a functional test with ExportControllerTest. |
@@ -27,12 +28,12 @@ class EntriesExport | |||
27 | </div'; | 28 | </div'; |
28 | 29 | ||
29 | /** | 30 | /** |
30 | * @param string $wallabagUrl Wallabag instance url | 31 | * @param Config $craueConfig CraueConfig instance to get wallabag instance url from database |
31 | * @param string $logoPath Path to the logo FROM THE BUNDLE SCOPE | 32 | * @param string $logoPath Path to the logo FROM THE BUNDLE SCOPE |
32 | */ | 33 | */ |
33 | public function __construct($wallabagUrl, $logoPath) | 34 | public function __construct(Config $craueConfig, $logoPath) |
34 | { | 35 | { |
35 | $this->wallabagUrl = $wallabagUrl; | 36 | $this->wallabagUrl = $craueConfig->get('wallabag_url'); |
36 | $this->logoPath = $logoPath; | 37 | $this->logoPath = $logoPath; |
37 | } | 38 | } |
38 | 39 | ||