* fix a bug for keep login.
This commit is contained in:
@@ -22,7 +22,7 @@ class settingModel extends model
|
||||
*/
|
||||
public function getSysAndPersonalConfig($account = '')
|
||||
{
|
||||
$owner = 'system,' . ($account ? $account : $this->app->user->account);
|
||||
$owner = 'system,' . ($account ? $account : '');
|
||||
$records = $this->dao->select('*')
|
||||
->from(TABLE_CONFIG)
|
||||
->where('owner')->in($owner)
|
||||
|
||||
@@ -322,6 +322,7 @@ class userModel extends model
|
||||
$this->session->set('user', $user);
|
||||
$this->app->user = $this->session->user;
|
||||
$this->loadModel('action')->create('user', $user->id, 'login');
|
||||
$this->loadModel('common')->loadConfigFromDB();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -342,6 +343,7 @@ class userModel extends model
|
||||
$this->session->set('user', $user);
|
||||
$this->app->user = $this->session->user;
|
||||
$this->loadModel('action')->create('user', $user->id, 'login');
|
||||
$this->loadModel('common')->loadConfigFromDB();
|
||||
|
||||
$this->keepLogin($user);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user