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

Convert other imports to Rabbit

Browse Source
This commit is contained in:
Jeremy Benoist
2016-09-04 21:49:21 +02:00
parent ef75e1220e
commit c98db1b653
14 changed files with 334 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/ImportBundle/Controller/WallabagController.php
View File

@ -38,6 +38,7 @@ abstract class WallabagController extends Controller
$form->handleRequest($request);
$wallabag = $this->getImportService();
$wallabag->setUser($this->getUser());
if ($form->isValid()) {
$file = $form->get('file')->getData();
@ -46,7 +47,6 @@ abstract class WallabagController extends Controller
if (in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes')) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) {
$res = $wallabag
->setUser($this->getUser())
->setFilepath($this->getParameter('wallabag_import.resource_dir').'/'.$name)
->setMarkAsRead($markAsRead)
->import();