From 10af545c104df0bee7f5b04322038e010c7946cb Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Tue, 2 Jul 2013 05:43:11 +0000
Subject: [PATCH] * finish task#1505.

---
 module/user/model.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/module/user/model.php b/module/user/model.php
index 36c34ed4db..0ec6c030de 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -176,10 +176,8 @@ class userModel extends model
      */
     public function getById($userID)
     {
-        $user = $this->dao->select('*')->from(TABLE_USER)
-            ->beginIF(is_numeric($userID))->where('id')->eq((int)$userID)->fi()
-            ->beginIF(!is_numeric($userID))->where('account')->eq($userID)->fi()
-            ->fetch();
+        $user = $this->dao->select('*')->from(TABLE_USER)->where('account')->eq($userID)->fetch();
+        if(!$user) $user = $this->dao->select('*')->from(TABLE_USER)->where('id')->eq($userID)->fetch();
         if(!$user) return false;
         $user->last = date(DT_DATETIME1, $user->last);
         return $user;