From 3525f166bbd0b38979cf0909c84bf09f4379819c Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Sun, 2 Dec 2012 07:54:23 +0000
Subject: [PATCH]  * fix a bug for keep login.

---
 module/setting/model.php | 2 +-
 module/user/model.php    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/setting/model.php b/module/setting/model.php
index faa257964e..9ff8cd9cf7 100644
--- a/module/setting/model.php
+++ b/module/setting/model.php
@@ -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)
diff --git a/module/user/model.php b/module/user/model.php
index 724b489c1d..b4aee65959 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -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);
     }