aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-06-10 11:36:03 +0200
committerGitHub <noreply@github.com>2017-06-10 11:36:03 +0200
commit679aaf08366c265b29d0e4b2e59919314cf338f9 (patch)
tree6b340839afa56747b6fa8aff3ede2f59d4dcc6d3 /src/Wallabag
parenta8993999893fb665b5e96597f9b649a2a8b940a2 (diff)
parent1a94252831638cf41f0fe489939dee9dae1c1251 (diff)
downloadwallabag-679aaf08366c265b29d0e4b2e59919314cf338f9.tar.gz
wallabag-679aaf08366c265b29d0e4b2e59919314cf338f9.tar.zst
wallabag-679aaf08366c265b29d0e4b2e59919314cf338f9.zip
Merge pull request #3173 from wallabag/domain-name-param
remove craueconfig domain name setting and add a proper one in parame…
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php2
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml4
-rw-r--r--src/Wallabag/UserBundle/Resources/config/services.yml2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index 0e61c642..89d27425 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -151,7 +151,7 @@ class ConfigController extends Controller
151 'token' => $config->getRssToken(), 151 'token' => $config->getRssToken(),
152 ], 152 ],
153 'twofactor_auth' => $this->getParameter('twofactor_auth'), 153 'twofactor_auth' => $this->getParameter('twofactor_auth'),
154 'wallabag_url' => $this->get('craue_config')->get('wallabag_url'), 154 'wallabag_url' => $this->getParameter('domain_name'),
155 'enabled_users' => $this->getDoctrine() 155 'enabled_users' => $this->getDoctrine()
156 ->getRepository('WallabagUserBundle:User') 156 ->getRepository('WallabagUserBundle:User')
157 ->getSumEnabledUsers(), 157 ->getSumEnabledUsers(),
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 2ae5d27f..4be79547 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -123,7 +123,7 @@ services:
123 wallabag_core.helper.entries_export: 123 wallabag_core.helper.entries_export:
124 class: Wallabag\CoreBundle\Helper\EntriesExport 124 class: Wallabag\CoreBundle\Helper\EntriesExport
125 arguments: 125 arguments:
126 - '@=service(''craue_config'').get(''wallabag_url'')' 126 - '%domain_name%'
127 - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png 127 - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png
128 128
129 wallabag.operator.array.matches: 129 wallabag.operator.array.matches:
@@ -196,7 +196,7 @@ services:
196 arguments: 196 arguments:
197 - "@wallabag_core.entry.download_images.client" 197 - "@wallabag_core.entry.download_images.client"
198 - "%kernel.root_dir%/../web/assets/images" 198 - "%kernel.root_dir%/../web/assets/images"
199 - '@=service(''craue_config'').get(''wallabag_url'')' 199 - '%domain_name%'
200 - "@logger" 200 - "@logger"
201 201
202 wallabag_core.entry.download_images.client: 202 wallabag_core.entry.download_images.client:
diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml
index f2cd6e01..d3925de3 100644
--- a/src/Wallabag/UserBundle/Resources/config/services.yml
+++ b/src/Wallabag/UserBundle/Resources/config/services.yml
@@ -7,7 +7,7 @@ services:
7 - "%scheb_two_factor.email.sender_email%" 7 - "%scheb_two_factor.email.sender_email%"
8 - "%scheb_two_factor.email.sender_name%" 8 - "%scheb_two_factor.email.sender_name%"
9 - '@=service(''craue_config'').get(''wallabag_support_url'')' 9 - '@=service(''craue_config'').get(''wallabag_support_url'')'
10 - '@=service(''craue_config'').get(''wallabag_url'')' 10 - '%domain_name%'
11 11
12 wallabag_user.password_resetting: 12 wallabag_user.password_resetting:
13 class: Wallabag\UserBundle\EventListener\PasswordResettingListener 13 class: Wallabag\UserBundle\EventListener\PasswordResettingListener