diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-07 13:46:30 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-07 13:46:30 +0200 |
| commit | 7083c0a21d27e7e1bf45a9807a76844116d61fb8 (patch) | |
| tree | b72b5a0516d9114aeeccd6ecdb055ee240bda66a /src/Wallabag/ImportBundle/Controller/BrowserController.php | |
| parent | 44043ebe82a22470e2514d05efac324035ee809a (diff) | |
| parent | 495f83c92539444bff7dfd6cd647b7d65a74f949 (diff) | |
| download | wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.tar.gz wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.tar.zst wallabag-7083c0a21d27e7e1bf45a9807a76844116d61fb8.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'src/Wallabag/ImportBundle/Controller/BrowserController.php')
| -rw-r--r-- | src/Wallabag/ImportBundle/Controller/BrowserController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Wallabag/ImportBundle/Controller/BrowserController.php b/src/Wallabag/ImportBundle/Controller/BrowserController.php index 77a7a904..6418925c 100644 --- a/src/Wallabag/ImportBundle/Controller/BrowserController.php +++ b/src/Wallabag/ImportBundle/Controller/BrowserController.php | |||
| @@ -30,7 +30,7 @@ abstract class BrowserController extends Controller | |||
| 30 | $markAsRead = $form->get('mark_as_read')->getData(); | 30 | $markAsRead = $form->get('mark_as_read')->getData(); |
| 31 | $name = $this->getUser()->getId() . '.json'; | 31 | $name = $this->getUser()->getId() . '.json'; |
| 32 | 32 | ||
| 33 | if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) { | 33 | if (null !== $file && \in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes'), true) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) { |
| 34 | $res = $wallabag | 34 | $res = $wallabag |
| 35 | ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name) | 35 | ->setFilepath($this->getParameter('wallabag_import.resource_dir') . '/' . $name) |
| 36 | ->setMarkAsRead($markAsRead) | 36 | ->setMarkAsRead($markAsRead) |