From 08ffbda08724b0ad8a1861a2bef63d0c19ddf83f Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 3 Aug 2022 09:03:19 +0800
Subject: [PATCH] * Optimize code for task #62949.

---
 module/user/control.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/module/user/control.php b/module/user/control.php
index 027a8a829e..c832fee07d 100755
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -877,11 +877,7 @@ class user extends control
 
             $user = $this->user->identify($account, $password);
 
-            if(is_array($user) and isset($user['result']))
-            {
-                return $this->send($user);
-            }
-            elseif($user)
+            if($user)
             {
                 /* Set user group, rights, view and aword login score. */
                 $user = $this->user->login($user);
@@ -968,6 +964,7 @@ class user extends control
                 }
 
                 $response['message'] = $this->lang->user->loginFailed;
+                if(dao::isError() and !empty(dao::getError()[0])) $response['message'] = dao::getError()[0];
                 return $this->send($response);
             }
         }