From e11a1cc3d3542f204d978de65253cbb0e5599d28 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Fri, 24 Feb 2017 12:44:07 +0700
Subject: [PATCH] Fixed profile language. Issue #11

---
 src/PHPCensor/Controller/UserController.php | 16 ++++++++++++----
 src/PHPCensor/Service/UserService.php       |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/PHPCensor/Controller/UserController.php b/src/PHPCensor/Controller/UserController.php
index 16a87cfa..e9a95948 100644
--- a/src/PHPCensor/Controller/UserController.php
+++ b/src/PHPCensor/Controller/UserController.php
@@ -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);
 
diff --git a/src/PHPCensor/Service/UserService.php b/src/PHPCensor/Service/UserService.php
index c7860aca..e7a27212 100644
--- a/src/PHPCensor/Service/UserService.php
+++ b/src/PHPCensor/Service/UserService.php
@@ -82,7 +82,7 @@ class UserService
         if (!is_null($isAdmin)) {
             $user->setIsAdmin(($isAdmin ? 1 : 0));
         }
-
+        
         $user->setLanguage($language);
         $user->setPerPage($perPage);