aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2017-06-08 19:15:33 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2017-06-08 19:15:33 +0200
commit80f4d85ac92ab4dc490c51f2d831ac7fa3853826 (patch)
tree0a13d4c7ee0e5ce34e2c21a6492de61a49e627e8 /src
parente48b238a3e2c387be1f897e6f2c3c481d25f5203 (diff)
downloadwallabag-80f4d85ac92ab4dc490c51f2d831ac7fa3853826.tar.gz
wallabag-80f4d85ac92ab4dc490c51f2d831ac7fa3853826.tar.zst
wallabag-80f4d85ac92ab4dc490c51f2d831ac7fa3853826.zip
Review
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/DependencyInjection/Configuration.php2
-rw-r--r--src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php1
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml2
3 files changed, 1 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
index a6f53714..33df92d3 100644
--- a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
@@ -63,8 +63,6 @@ class Configuration implements ConfigurationInterface
63 ->end() 63 ->end()
64 ->end() 64 ->end()
65 ->end() 65 ->end()
66 ->scalarNode('domain_name')
67 ->end()
68 ->end() 66 ->end()
69 ; 67 ;
70 68
diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
index d0b4351e..b4d8a386 100644
--- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
@@ -29,7 +29,6 @@ class WallabagCoreExtension extends Extension
29 $container->setParameter('wallabag_core.fetching_error_message_title', $config['fetching_error_message_title']); 29 $container->setParameter('wallabag_core.fetching_error_message_title', $config['fetching_error_message_title']);
30 $container->setParameter('wallabag_core.api_limit_mass_actions', $config['api_limit_mass_actions']); 30 $container->setParameter('wallabag_core.api_limit_mass_actions', $config['api_limit_mass_actions']);
31 $container->setParameter('wallabag_core.default_internal_settings', $config['default_internal_settings']); 31 $container->setParameter('wallabag_core.default_internal_settings', $config['default_internal_settings']);
32 $container->setParameter('wallabag_core.domain_name', $config['domain_name']);
33 32
34 $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); 33 $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
35 $loader->load('services.yml'); 34 $loader->load('services.yml');
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 6e2c9761..8b00700f 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -195,7 +195,7 @@ services:
195 arguments: 195 arguments:
196 - "@wallabag_core.entry.download_images.client" 196 - "@wallabag_core.entry.download_images.client"
197 - "%kernel.root_dir%/../web/assets/images" 197 - "%kernel.root_dir%/../web/assets/images"
198 - '%wallabag_core.domain_name%' 198 - '%domain_name%'
199 - "@logger" 199 - "@logger"
200 200
201 wallabag_core.entry.download_images.client: 201 wallabag_core.entry.download_images.client: