diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@smile.fr> | 2015-10-22 16:57:56 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-02 23:24:17 +0100 |
commit | d275bdf4d36f90ff61f1e6a714c9ef64d210596f (patch) | |
tree | 1fb9cd40f2d75e1a39cec2636d3caa510045fc48 /src/Wallabag/CoreBundle/Command | |
parent | 8c3c77c1bd5c3763c127bfea52e908e77dc751b9 (diff) | |
download | wallabag-d275bdf4d36f90ff61f1e6a714c9ef64d210596f.tar.gz wallabag-d275bdf4d36f90ff61f1e6a714c9ef64d210596f.tar.zst wallabag-d275bdf4d36f90ff61f1e6a714c9ef64d210596f.zip |
form to upload file
Diffstat (limited to 'src/Wallabag/CoreBundle/Command')
-rw-r--r-- | src/Wallabag/CoreBundle/Command/ImportCommand.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Command/ImportCommand.php b/src/Wallabag/CoreBundle/Command/ImportCommand.php index 16c84229..6be6f5e1 100644 --- a/src/Wallabag/CoreBundle/Command/ImportCommand.php +++ b/src/Wallabag/CoreBundle/Command/ImportCommand.php | |||
@@ -51,7 +51,7 @@ class ImportCommand extends ContainerAwareCommand | |||
51 | $batchSize = 20; | 51 | $batchSize = 20; |
52 | $i = 1; | 52 | $i = 1; |
53 | 53 | ||
54 | $user = $em->getRepository('WallabagCoreBundle:User') | 54 | $user = $em->getRepository('WallabagUserBundle:User') |
55 | ->findOneById($input->getArgument('userId')); | 55 | ->findOneById($input->getArgument('userId')); |
56 | 56 | ||
57 | if (!is_object($user)) { | 57 | if (!is_object($user)) { |
@@ -116,6 +116,7 @@ class ImportCommand extends ContainerAwareCommand | |||
116 | protected function get(InputInterface $input, OutputInterface $output) | 116 | protected function get(InputInterface $input, OutputInterface $output) |
117 | { | 117 | { |
118 | $filename = __DIR__.'/../../../../web/uploads/import/'.$input->getArgument('userId').'.json'; | 118 | $filename = __DIR__.'/../../../../web/uploads/import/'.$input->getArgument('userId').'.json'; |
119 | |||
119 | $data = $this->convert($filename); | 120 | $data = $this->convert($filename); |
120 | 121 | ||
121 | return $data; | 122 | return $data; |