1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-22 17:18:37 +00:00

Merge pull request #3173 from wallabag/domain-name-param

remove craueconfig domain name setting and add a proper one in parame…
This commit is contained in:
Jérémy Benoist 2017-06-10 11:36:03 +02:00 committed by GitHub
commit 679aaf0836
18 changed files with 60 additions and 20 deletions

View file

@ -151,7 +151,7 @@ class ConfigController extends Controller
'token' => $config->getRssToken(),
],
'twofactor_auth' => $this->getParameter('twofactor_auth'),
'wallabag_url' => $this->get('craue_config')->get('wallabag_url'),
'wallabag_url' => $this->getParameter('domain_name'),
'enabled_users' => $this->getDoctrine()
->getRepository('WallabagUserBundle:User')
->getSumEnabledUsers(),

View file

@ -123,7 +123,7 @@ services:
wallabag_core.helper.entries_export:
class: Wallabag\CoreBundle\Helper\EntriesExport
arguments:
- '@=service(''craue_config'').get(''wallabag_url'')'
- '%domain_name%'
- src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png
wallabag.operator.array.matches:
@ -196,7 +196,7 @@ services:
arguments:
- "@wallabag_core.entry.download_images.client"
- "%kernel.root_dir%/../web/assets/images"
- '@=service(''craue_config'').get(''wallabag_url'')'
- '%domain_name%'
- "@logger"
wallabag_core.entry.download_images.client:

View file

@ -7,7 +7,7 @@ services:
- "%scheb_two_factor.email.sender_email%"
- "%scheb_two_factor.email.sender_name%"
- '@=service(''craue_config'').get(''wallabag_support_url'')'
- '@=service(''craue_config'').get(''wallabag_url'')'
- '%domain_name%'
wallabag_user.password_resetting:
class: Wallabag\UserBundle\EventListener\PasswordResettingListener