aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Controller/ConfigController.php
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-02-04 15:59:57 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-02-04 15:59:57 +0100
commite008c037f53324b931f027483f9f1053171109c5 (patch)
tree441c54eb946ffb53a161cad8f686ce7aff875abd /src/Wallabag/CoreBundle/Controller/ConfigController.php
parent74f39b0952440fa0c55e5e8a2e1a8d2bbd3acfd7 (diff)
parent79b9e49d9464e9a67f6ee66fbf6f6c541b1a29f4 (diff)
downloadwallabag-e008c037f53324b931f027483f9f1053171109c5.tar.gz
wallabag-e008c037f53324b931f027483f9f1053171109c5.tar.zst
wallabag-e008c037f53324b931f027483f9f1053171109c5.zip
Merge pull request #1612 from wallabag/v2-settings-page
Settings page
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/ConfigController.php')
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index b01aaa7f..b7799746 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -133,10 +133,10 @@ class ConfigController extends Controller
133 $userManager->updateUser($newUser, true); 133 $userManager->updateUser($newUser, true);
134 134
135 $config = new Config($newUser); 135 $config = new Config($newUser);
136 $config->setTheme($this->container->getParameter('theme')); 136 $config->setTheme($this->getParameter('wallabag_core.theme'));
137 $config->setItemsPerPage($this->container->getParameter('items_on_page')); 137 $config->setItemsPerPage($this->getParameter('wallabag_core.items_on_page'));
138 $config->setRssLimit($this->container->getParameter('rss_limit')); 138 $config->setRssLimit($this->getParameter('wallabag_core.rss_limit'));
139 $config->setLanguage($this->container->getParameter('language')); 139 $config->setLanguage($this->getParameter('wallabag_core.language'));
140 140
141 $em->persist($config); 141 $em->persist($config);
142 142
@@ -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