diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-04-13 13:07:06 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-04-13 13:07:06 +0200 |
commit | 3e7a843aa998442148061347e7978722b8cd87d2 (patch) | |
tree | 0369670297ed0f18b7e60db16f500f649391dde4 /src/Wallabag/CoreBundle/Helper/EntriesExport.php | |
parent | 19122cf66037f86375072ffa60b6a43b54f02f99 (diff) | |
parent | 656395fde63fe566bf44ee63b1344efdd8c2e653 (diff) | |
download | wallabag-3e7a843aa998442148061347e7978722b8cd87d2.tar.gz wallabag-3e7a843aa998442148061347e7978722b8cd87d2.tar.zst wallabag-3e7a843aa998442148061347e7978722b8cd87d2.zip |
Merge branch 'master' into 2.3
Diffstat (limited to 'src/Wallabag/CoreBundle/Helper/EntriesExport.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/EntriesExport.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php index 93c01fcb..3d36a4c8 100644 --- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php +++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php | |||
@@ -148,8 +148,6 @@ class EntriesExport | |||
148 | $book->setCoverImage('Cover.png', file_get_contents($this->logoPath), 'image/png'); | 148 | $book->setCoverImage('Cover.png', file_get_contents($this->logoPath), 'image/png'); |
149 | } | 149 | } |
150 | 150 | ||
151 | $book->addChapter('Notices', 'Cover2.html', $content_start.$this->getExportInformation('PHPePub').$bookEnd); | ||
152 | |||
153 | $book->buildTOC(); | 151 | $book->buildTOC(); |
154 | 152 | ||
155 | /* | 153 | /* |
@@ -170,6 +168,8 @@ class EntriesExport | |||
170 | $book->addChapter($entry->getTitle(), htmlspecialchars($filename).'.html', $chapter, true, EPub::EXTERNAL_REF_ADD); | 168 | $book->addChapter($entry->getTitle(), htmlspecialchars($filename).'.html', $chapter, true, EPub::EXTERNAL_REF_ADD); |
171 | } | 169 | } |
172 | 170 | ||
171 | $book->addChapter('Notices', 'Cover2.html', $content_start.$this->getExportInformation('PHPePub').$bookEnd); | ||
172 | |||
173 | return Response::create( | 173 | return Response::create( |
174 | $book->getBook(), | 174 | $book->getBook(), |
175 | 200, | 175 | 200, |