diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-06-10 11:36:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-10 11:36:03 +0200 |
commit | 679aaf08366c265b29d0e4b2e59919314cf338f9 (patch) | |
tree | 6b340839afa56747b6fa8aff3ede2f59d4dcc6d3 /src/Wallabag/CoreBundle/Controller | |
parent | a8993999893fb665b5e96597f9b649a2a8b940a2 (diff) | |
parent | 1a94252831638cf41f0fe489939dee9dae1c1251 (diff) | |
download | wallabag-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/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 2 |
1 files changed, 1 insertions, 1 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(), |