Applied fixes from FlintCI

main/inc/lib/usermanager.lib.php

@@ -374,9 +374,8 @@ class UserManager
             $user->setExpirationDate($expirationDate);
         }
         try {
-
+            $userManager->updateUser($user);
-        $userManager->updateUser($user);
+            $userId = $user->getId();
-        $userId = $user->getId();
         } catch (Exception $e) {
             error_log($e->getMessage());
         }

main/install/index.php

@@ -76,7 +76,7 @@ $installationLanguage = 'en';
 if (!empty($_POST['language_list'])) {
     $search = ['../', '\\0'];
     $installationLanguage = str_replace($search, '', urldecode($_POST['language_list']));
-    //$_SESSION['install_language'] = $installationLanguage;
+//$_SESSION['install_language'] = $installationLanguage;
 } else {
     // Trying to switch to the browser's language, it is covenient for most of the cases.
     $installationLanguage = detect_browser_language();

src/CoreBundle/Framework/Container.php

@@ -400,7 +400,5 @@ class Container
         Container::setUserManager($container->get('sonata.user.user_manager'));
         Container::setSiteManager($container->get('sonata.page.manager.site'));
         Container::$session = $container->get('session');
-
-
     }
 }