pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Jeremy Benoist
2016-11-03 18:01:25 +01:00
parent 864c1dd23a
commit 001cc7168a
7 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Controller/ConfigController.php
View File

@ -234,8 +234,6 @@ class ConfigController extends Controller
*/
public function resetAction($type)
{
$em = $this->getDoctrine()->getManager();
switch ($type) {
case 'annotations':
$this->getDoctrine()

2
src/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriber.php
View File

@ -39,7 +39,7 @@ class TablePrefixSubscriber implements EventSubscriber
return;
}
$classMetadata->setTableName($this->prefix.$classMetadata->getTableName());
$classMetadata->setPrimaryTable(['name' => $this->prefix.$classMetadata->getTableName()]);
foreach ($classMetadata->getAssociationMappings() as $fieldName => $mapping) {
if ($mapping['type'] === ClassMetadataInfo::MANY_TO_MANY && isset($classMetadata->associationMappings[$fieldName]['joinTable']['name'])) {

6
src/Wallabag/CoreBundle/Helper/DownloadImages.php
View File

@ -135,16 +135,16 @@ class DownloadImages
switch ($ext) {
case 'gif':
$result = imagegif($im, $localPath);
imagegif($im, $localPath);
$this->logger->debug('DownloadImages: Re-creating gif');
break;
case 'jpeg':
case 'jpg':
$result = imagejpeg($im, $localPath, self::REGENERATE_PICTURES_QUALITY);
imagejpeg($im, $localPath, self::REGENERATE_PICTURES_QUALITY);
$this->logger->debug('DownloadImages: Re-creating jpg');
break;
case 'png':
$result = 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');
}