aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2017-10-08 11:03:32 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2017-10-11 10:43:19 +0200
commitdc7fa8dfc606a03295a58d797f269f3ed7097939 (patch)
tree5bfa74ca8276c2ced27a40171d181b055b5e7e4c
parentb1428a1cf8cad5002b51d97271da66c67aa3638a (diff)
downloadwallabag-dc7fa8dfc606a03295a58d797f269f3ed7097939.tar.gz
wallabag-dc7fa8dfc606a03295a58d797f269f3ed7097939.tar.zst
wallabag-dc7fa8dfc606a03295a58d797f269f3ed7097939.zip
Fixed @tcitworld's review
-rw-r--r--src/Wallabag/CoreBundle/Helper/EntriesExport.php8
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml2
2 files changed, 3 insertions, 7 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index 3e1cd522..f43bc33d 100644
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@ -23,20 +23,16 @@ class EntriesExport
23 private $entries = []; 23 private $entries = [];
24 private $author = 'wallabag'; 24 private $author = 'wallabag';
25 private $language = ''; 25 private $language = '';
26 private $footerTemplate = '<div style="text-align:center;">
27 <p>Produced by wallabag with %EXPORT_METHOD%</p>
28 <p>Please open <a href="https://github.com/wallabag/wallabag/issues">an issue</a> if you have trouble with the display of this E-Book on your device.</p>
29 </div>';
30 26
31 /** 27 /**
32 * @param string $wallabagUrl Wallabag instance url 28 * @param string $wallabagUrl Wallabag instance url
33 * @param string $logoPath Path to the logo FROM THE BUNDLE SCOPE 29 * @param string $logoPath Path to the logo FROM THE BUNDLE SCOPE
34 */ 30 */
35 public function __construct($wallabagUrl, $logoPath, TranslatorInterface $translator) 31 public function __construct(TranslatorInterface $translator, $wallabagUrl, $logoPath)
36 { 32 {
33 $this->translator = $translator;
37 $this->wallabagUrl = $wallabagUrl; 34 $this->wallabagUrl = $wallabagUrl;
38 $this->logoPath = $logoPath; 35 $this->logoPath = $logoPath;
39 $this->translator = $translator;
40 } 36 }
41 37
42 /** 38 /**
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 6f8c47e1..caef2c8d 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -132,9 +132,9 @@ services:
132 wallabag_core.helper.entries_export: 132 wallabag_core.helper.entries_export:
133 class: Wallabag\CoreBundle\Helper\EntriesExport 133 class: Wallabag\CoreBundle\Helper\EntriesExport
134 arguments: 134 arguments:
135 - "@translator"
135 - '%domain_name%' 136 - '%domain_name%'
136 - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png 137 - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png
137 - "@translator"
138 138
139 wallabag.operator.array.matches: 139 wallabag.operator.array.matches:
140 class: Wallabag\CoreBundle\Operator\PHP\Matches 140 class: Wallabag\CoreBundle\Operator\PHP\Matches