aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-10-15 09:24:32 +0200
committerGitHub <noreply@github.com>2017-10-15 09:24:32 +0200
commit393020100350140e421d991a3fc7d12eaf69a8b7 (patch)
tree39c058cfca7543ac4a3e60e8a5ffc97db7629474 /src
parent64f4112caea165d79d10c624bcc69e6a3597714f (diff)
parent9ca069a6fea67ddf2ef44601901ea3c02e3cffbe (diff)
downloadwallabag-393020100350140e421d991a3fc7d12eaf69a8b7.tar.gz
wallabag-393020100350140e421d991a3fc7d12eaf69a8b7.tar.zst
wallabag-393020100350140e421d991a3fc7d12eaf69a8b7.zip
Merge pull request #3382 from nclsHart/replace-kernel-rootdir
Replace kernel.root_dir by kernel.project_dir
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Command/ExportCommand.php2
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml2
2 files changed, 2 insertions, 2 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/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