diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 0ea635e569..88469d888f 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -374,9 +374,8 @@ class UserManager $user->setExpirationDate($expirationDate); } try { - - $userManager->updateUser($user); - $userId = $user->getId(); + $userManager->updateUser($user); + $userId = $user->getId(); } catch (Exception $e) { error_log($e->getMessage()); } diff --git a/main/install/index.php b/main/install/index.php index 1a4e0c108f..8c994d545a 100755 --- a/main/install/index.php +++ b/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(); diff --git a/src/CoreBundle/Framework/Container.php b/src/CoreBundle/Framework/Container.php index 18f5d0a71f..ce94988f49 100644 --- a/src/CoreBundle/Framework/Container.php +++ b/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'); - - } }