devol/wallabag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed @tcitworld's review

Browse Source
This commit is contained in:
Nicolas Lœuillet 2017-10-08 11:03:32 +02:00 committed by Jeremy Benoist
parent b1428a1cf8
commit dc7fa8dfc6
No known key found for this signature in database
GPG Key ID: BCA73962457ACC3C
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Wallabag/CoreBundle/Helper/EntriesExport.php
View File

@ -23,20 +23,16 @@ class EntriesExport
private $entries = []; private $entries = [];
private $author = 'wallabag'; private $author = 'wallabag';
private $language = ''; private $language = '';
private $footerTemplate = '<div style="text-align:center;">
<p>Produced by wallabag with %EXPORT_METHOD%</p>
<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>
</div>';
/** /**
* @param string $wallabagUrl Wallabag instance url * @param string $wallabagUrl Wallabag instance url
* @param string $logoPath Path to the logo FROM THE BUNDLE SCOPE * @param string $logoPath Path to the logo FROM THE BUNDLE SCOPE
*/ */
public function __construct($wallabagUrl, $logoPath, TranslatorInterface $translator) public function __construct(TranslatorInterface $translator, $wallabagUrl, $logoPath)
{ {
$this->translator = $translator;
$this->wallabagUrl = $wallabagUrl; $this->wallabagUrl = $wallabagUrl;
$this->logoPath = $logoPath; $this->logoPath = $logoPath;
$this->translator = $translator;
} }
/** /**

2
src/Wallabag/CoreBundle/Resources/config/services.yml
View File

@ -132,9 +132,9 @@ services:
wallabag_core.helper.entries_export: wallabag_core.helper.entries_export:
class: Wallabag\CoreBundle\Helper\EntriesExport class: Wallabag\CoreBundle\Helper\EntriesExport
arguments: arguments:
- "@translator"
- '%domain_name%' - '%domain_name%'
- src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png
- "@translator"
wallabag.operator.array.matches: wallabag.operator.array.matches:
class: Wallabag\CoreBundle\Operator\PHP\Matches class: Wallabag\CoreBundle\Operator\PHP\Matches