Handle default value for new user

2 files changed, 12 insertions, 5 deletions

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index a4301958..c1b72604 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -135,11 +135,10 @@ class InstallCommand extends ContainerAwareCommand
 
         $em->persist($user);
 
-        $config = new Config();
-        $config->setUser($user);
-        $config->setTheme('baggy');
-        $config->setItemsPerPage(10);
-        $config->setLanguage('en_US');
+        $config = new Config($user);
+        $config->setTheme($this->getContainer()->getParameter('theme'));
+        $config->setItemsPerPage($this->getContainer()->getParameter('items_on_page'));
+        $config->setLanguage($this->getContainer()->getParameter('language'));
 
         $em->persist($config);
     }
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index aedbc999..68e034fa 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -81,6 +81,14 @@ class ConfigController extends Controller
 
         if ($newUserForm->isValid()) {
             $em->persist($newUser);
+
+            $config = new Config($newUser);
+            $config->setTheme($this->container->getParameter('theme'));
+            $config->setItemsPerPage($this->container->getParameter('items_on_page'));
+            $config->setLanguage($this->container->getParameter('language'));
+
+            $em->persist($config);
+
             $em->flush();
 
             $this->get('session')->getFlashBag()->add(