diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-21 08:53:09 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-01-31 14:48:26 +0100 |
commit | 63e40f2d7c4074aff0be587c828eb511a6b7c878 (patch) | |
tree | 038959b20e15c60841f8f3584c99068f52460939 /src/Wallabag/CoreBundle/Controller | |
parent | 26975877d76a99f6a3153d3d3b4fc6c9f32687bc (diff) | |
download | wallabag-63e40f2d7c4074aff0be587c828eb511a6b7c878.tar.gz wallabag-63e40f2d7c4074aff0be587c828eb511a6b7c878.tar.zst wallabag-63e40f2d7c4074aff0be587c828eb511a6b7c878.zip |
Add CraueConfig for internal settings
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 1 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/StaticController.php | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 4ece6431..c7513f79 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -163,6 +163,7 @@ class ConfigController extends Controller | |||
163 | 'username' => $user->getUsername(), | 163 | 'username' => $user->getUsername(), |
164 | 'token' => $config->getRssToken(), | 164 | 'token' => $config->getRssToken(), |
165 | ), | 165 | ), |
166 | 'twofactor_auth' => $this->getParameter('twofactor_auth'), | ||
166 | )); | 167 | )); |
167 | } | 168 | } |
168 | 169 | ||
diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php index 9ada371b..5b7bd56e 100644 --- a/src/Wallabag/CoreBundle/Controller/StaticController.php +++ b/src/Wallabag/CoreBundle/Controller/StaticController.php | |||
@@ -25,7 +25,10 @@ class StaticController extends Controller | |||
25 | { | 25 | { |
26 | return $this->render( | 26 | return $this->render( |
27 | 'WallabagCoreBundle:Static:about.html.twig', | 27 | 'WallabagCoreBundle:Static:about.html.twig', |
28 | array() | 28 | array( |
29 | 'version' => $this->getParameter('wallabag_core.version'), | ||
30 | 'paypal_url' => $this->getParameter('wallabag_core.paypal_url'), | ||
31 | ) | ||
29 | ); | 32 | ); |
30 | } | 33 | } |
31 | 34 | ||