aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-10-04 21:11:10 +0200
committerGravatar GitHub <noreply@github.com> 2016-10-04 21:11:10 +0200
commit76c4a9aec1ae6b11efbeda16e639b47b9a5e793f (patch)
tree4b2edaf63eb5dcaa4c3d93f4a9c70101ec147736 /app/Controllers
parent4d467277058bb016db072b7f30b587fa9347a729 (diff)
parent6a6ae345db5e0f0ac2c9d8fbef4e0272e687b81c (diff)
Merge pull request #1279 from Alkarex/new-user-language
Fix bug language option for new user
Diffstat (limited to 'app/Controllers')
-rw-r--r--app/Controllers/userController.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 0521bc008..c259ffde9 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -121,7 +121,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
$new_user_language = Minz_Request::param('new_user_language', FreshRSS_Context::$user_conf->language);
$languages = Minz_Translate::availableLanguages();
- if (!isset($languages[$new_user_language])) {
+ if (!in_array($new_user_language, $languages)) {
$new_user_language = FreshRSS_Context::$user_conf->language;
}
@@ -165,7 +165,7 @@ class FreshRSS_user_Controller extends Minz_ActionController {
}
if ($ok) {
$userDAO = new FreshRSS_UserDAO();
- $ok &= $userDAO->createUser($new_user_name);
+ $ok &= $userDAO->createUser($new_user_name, $new_user_language);
}
invalidateHttpCache();