diff options
Diffstat (limited to 'src/Wallabag/CoreBundle')
-rw-r--r-- | src/Wallabag/CoreBundle/Command/ExportCommand.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Repository/EntryRepository.php | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/config/services.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Command/ExportCommand.php b/src/Wallabag/CoreBundle/Command/ExportCommand.php index b07087c8..75e9ad91 100644 --- a/src/Wallabag/CoreBundle/Command/ExportCommand.php +++ b/src/Wallabag/CoreBundle/Command/ExportCommand.php | |||
@@ -52,7 +52,7 @@ class ExportCommand extends ContainerAwareCommand | |||
52 | $filePath = $input->getArgument('filepath'); | 52 | $filePath = $input->getArgument('filepath'); |
53 | 53 | ||
54 | if (!$filePath) { | 54 | if (!$filePath) { |
55 | $filePath = $this->getContainer()->getParameter('kernel.root_dir') . '/../' . sprintf('%s-export.json', $user->getUsername()); | 55 | $filePath = $this->getContainer()->getParameter('kernel.project_dir') . '/' . sprintf('%s-export.json', $user->getUsername()); |
56 | } | 56 | } |
57 | 57 | ||
58 | try { | 58 | try { |
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 05f0e0ba..b5e35eff 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php | |||
@@ -151,7 +151,7 @@ class EntryRepository extends EntityRepository | |||
151 | $qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since))); | 151 | $qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since))); |
152 | } | 152 | } |
153 | 153 | ||
154 | if ('' !== $tags) { | 154 | if (is_string($tags) && '' !== $tags) { |
155 | foreach (explode(',', $tags) as $i => $tag) { | 155 | foreach (explode(',', $tags) as $i => $tag) { |
156 | $entryAlias = 'e' . $i; | 156 | $entryAlias = 'e' . $i; |
157 | $tagAlias = 't' . $i; | 157 | $tagAlias = 't' . $i; |
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index caef2c8d..31b16739 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -205,7 +205,7 @@ services: | |||
205 | class: Wallabag\CoreBundle\Helper\DownloadImages | 205 | class: Wallabag\CoreBundle\Helper\DownloadImages |
206 | arguments: | 206 | arguments: |
207 | - "@wallabag_core.entry.download_images.client" | 207 | - "@wallabag_core.entry.download_images.client" |
208 | - "%kernel.root_dir%/../web/assets/images" | 208 | - "%kernel.project_dir%/web/assets/images" |
209 | - '%domain_name%' | 209 | - '%domain_name%' |
210 | - "@logger" | 210 | - "@logger" |
211 | 211 | ||