mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-24 18:11:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 2.3

Browse source
This commit is contained in:
Nicolas Lœuillet 2017-04-13 13:07:06 +02:00
commit 3e7a843aa9
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Helper/DownloadImages.php
View file

@ -144,6 +144,8 @@ class DownloadImages
$this->logger->debug('DownloadImages: Re-creating jpg'); $this->logger->debug('DownloadImages: Re-creating jpg');
break; break;
case 'png': case 'png':
imagealphablending($im, false);
imagesavealpha($im, true);
imagepng($im, $localPath, ceil(self::REGENERATE_PICTURES_QUALITY / 100 * 9)); imagepng($im, $localPath, ceil(self::REGENERATE_PICTURES_QUALITY / 100 * 9));
$this->logger->debug('DownloadImages: Re-creating png'); $this->logger->debug('DownloadImages: Re-creating png');
} }

4
src/Wallabag/CoreBundle/Helper/EntriesExport.php
View file

@ -148,8 +148,6 @@ class EntriesExport
$book->setCoverImage('Cover.png', file_get_contents($this->logoPath), 'image/png'); $book->setCoverImage('Cover.png', file_get_contents($this->logoPath), 'image/png');
} }
$book->addChapter('Notices', 'Cover2.html', $content_start.$this->getExportInformation('PHPePub').$bookEnd);
$book->buildTOC(); $book->buildTOC();
/* /*
@ -170,6 +168,8 @@ class EntriesExport
$book->addChapter($entry->getTitle(), htmlspecialchars($filename).'.html', $chapter, true, EPub::EXTERNAL_REF_ADD); $book->addChapter($entry->getTitle(), htmlspecialchars($filename).'.html', $chapter, true, EPub::EXTERNAL_REF_ADD);
} }
$book->addChapter('Notices', 'Cover2.html', $content_start.$this->getExportInformation('PHPePub').$bookEnd);
return Response::create( return Response::create(
$book->getBook(), $book->getBook(),
200, 200,