diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-03 16:41:29 +0100 |
| commit | 5a619812ca3eb05a82a023ccdaee13501eb8d45f (patch) | |
| tree | a1541999a3e13f9bb8b45d3a61320ee61aa4eb3c /src/Wallabag/ImportBundle/Command | |
| parent | da4136557963018287cae61226e9006c3c741747 (diff) | |
| parent | 84795d015b3c7e1af48a3dda3cb33cf080b66e8f (diff) | |
| download | wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.gz wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.tar.zst wallabag-5a619812ca3eb05a82a023ccdaee13501eb8d45f.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'src/Wallabag/ImportBundle/Command')
| -rw-r--r-- | src/Wallabag/ImportBundle/Command/ImportCommand.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Wallabag/ImportBundle/Command/ImportCommand.php b/src/Wallabag/ImportBundle/Command/ImportCommand.php index 2f7a906e..13f3dcb9 100644 --- a/src/Wallabag/ImportBundle/Command/ImportCommand.php +++ b/src/Wallabag/ImportBundle/Command/ImportCommand.php | |||
| @@ -56,6 +56,9 @@ class ImportCommand extends ContainerAwareCommand | |||
| 56 | case 'instapaper': | 56 | case 'instapaper': |
| 57 | $import = $this->getContainer()->get('wallabag_import.instapaper.import'); | 57 | $import = $this->getContainer()->get('wallabag_import.instapaper.import'); |
| 58 | break; | 58 | break; |
| 59 | case 'instapaper': | ||
| 60 | $wallabag = $this->getContainer()->get('wallabag_import.instapaper.import'); | ||
| 61 | break; | ||
| 59 | case 'v1': | 62 | case 'v1': |
| 60 | default: | 63 | default: |
| 61 | $import = $this->getContainer()->get('wallabag_import.wallabag_v1.import'); | 64 | $import = $this->getContainer()->get('wallabag_import.wallabag_v1.import'); |