deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed profile language. Issue #11

Browse source
This commit is contained in:
Dmitry Khomutov 2017-02-24 12:44:07 +07:00
parent 07815d85eb
commit e11a1cc3d3
No known key found for this signature in database
GPG key ID: 7EB36C9576F9ECB9
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/PHPCensor/Controller/UserController.php
View file

@ -69,8 +69,16 @@ class UserController extends Controller
$name = $this->getParam('name', null);
$email = $this->getParam('email', null);
$password = $this->getParam('password', null);
$language = $this->getParam('language', null);
if (!$language) {
$language = null;
}
$perPage = $this->getParam('per_page', null);
if (!$perPage) {
$perPage = null;
}
$_SESSION['php-censor-user'] = $this->userService->updateUser($user, $name, $email, $password, null, $language, $perPage);
$user = $_SESSION['php-censor-user'];
@ -115,7 +123,7 @@ class UserController extends Controller
$language->setLabel(Lang::get('language'));
$language->setRequired(true);
$language->setOptions(array_merge(
['' => Lang::get('default') . ' (' . b8\Config::getInstance()->get('php-censor.language') . ')'],
[null => Lang::get('default') . ' (' . b8\Config::getInstance()->get('php-censor.language') . ')'],
Lang::getLanguageOptions())
);
$language->setValue($user->getLanguage());
@ -216,10 +224,10 @@ class UserController extends Controller
return $view->render();
}
$name = $this->getParam('name', null);
$email = $this->getParam('email', null);
$name = $this->getParam('name', null);
$email = $this->getParam('email', null);
$password = $this->getParam('password', null);
$isAdmin = (int)$this->getParam('is_admin', 0);
$isAdmin = (int)$this->getParam('is_admin', 0);
$this->userService->updateUser($user, $name, $email, $password, $isAdmin);

2
src/PHPCensor/Service/UserService.php
View file

@ -82,7 +82,7 @@ class UserService
if (!is_null($isAdmin)) {
$user->setIsAdmin(($isAdmin ? 1 : 0));
}
$user->setLanguage($language);
$user->setPerPage($perPage);