From d34ab220cca37904e9759771163130f890d5465e Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 1 Jul 2014 17:12:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8D=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 2ae3083d8..6138f9b56 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -577,15 +577,16 @@ class User < Principal
   # Find a user account by matching the exact login and then a case-insensitive
   # version.  Exact matches will be given priority.
   #通过用户名查找相应的用户，若没有匹配到，则不区分大小写进行查询
+  #修改：不再匹配不区分大小写情况 -zjc
   def self.find_by_login(login)
     if login.present?
       login = login.to_s
       # First look for an exact match
       user = where(:login => login).all.detect {|u| u.login == login}
-      unless user
-        # Fail over to case-insensitive if none was found
-        user = where("LOWER(login) = ?", login.downcase).first
-      end
+      #unless user
+      #  # Fail over to case-insensitive if none was found
+      #  user = where("LOWER(login) = ?", login.downcase).first
+      #end
       user
     end
   end