Fix SMTP auth logic

diff --git a/gogs.go b/gogs.go
index 9db5c71a1cc5b9d45ed44881f4ab297b21182320..289ad19123494130940ab452c00687b248594137 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
        "github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.4.1001 Beta"
+const APP_VER = "0.5.4.1003 Beta"
 
 func init() {
        runtime.GOMAXPROCS(runtime.NumCPU())

diff --git a/models/login.go b/models/login.go
index da7722f294a0f22b888b4fc1cdf2c96f0257a81c..2c5fc68e9c79db5b0aa7ede65457fe128012dc00 100644 (file)
--- a/models/login.go
+++ b/models/login.go
@@ -161,12 +161,8 @@ func UserSignIn(uname, passwd string) (*User, error) {
                return nil, err
        }
 
-       if u.LoginType == NOTYPE {
-               if has {
-                       u.LoginType = PLAIN
-               } else {
-                       return nil, ErrUserNotExist
-               }
+       if u.LoginType == NOTYPE && has {
+               u.LoginType = PLAIN
        }
 
        // For plain login, user must exist to reach this line.

diff --git a/models/user.go b/models/user.go
index dcf5afa4fb3c9fe16e3fcb63a9107d9e6d692c68..ee8f8586d591f91e18ee0a9558b057574a1a892d 100644 (file)
--- a/models/user.go
+++ b/models/user.go
@@ -600,27 +600,27 @@ type Follow struct {
 
 // FollowUser marks someone be another's follower.
 func FollowUser(userId int64, followId int64) (err error) {
-       session := x.NewSession()
-       defer session.Close()
-       session.Begin()
+       sess := x.NewSession()
+       defer sess.Close()
+       sess.Begin()
 
-       if _, err = session.Insert(&Follow{UserId: userId, FollowId: followId}); err != nil {
-               session.Rollback()
+       if _, err = sess.Insert(&Follow{UserId: userId, FollowId: followId}); err != nil {
+               sess.Rollback()
                return err
        }
 
        rawSql := "UPDATE `user` SET num_followers = num_followers + 1 WHERE id = ?"
-       if _, err = session.Exec(rawSql, followId); err != nil {
-               session.Rollback()
+       if _, err = sess.Exec(rawSql, followId); err != nil {
+               sess.Rollback()
                return err
        }
 
        rawSql = "UPDATE `user` SET num_followings = num_followings + 1 WHERE id = ?"
-       if _, err = session.Exec(rawSql, userId); err != nil {
-               session.Rollback()
+       if _, err = sess.Exec(rawSql, userId); err != nil {
+               sess.Rollback()
                return err
        }
-       return session.Commit()
+       return sess.Commit()
 }
 
 // UnFollowUser unmarks someone be another's follower.

diff --git a/templates/.VERSION b/templates/.VERSION
index bae760995d7ede3b42a2a26ab08629a7cf35156c..24a40ce35805668022bc3d2365592aad64647bd3 100644 (file)
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.4.1001 Beta
\ No newline at end of file
+0.5.4.1003 Beta
\ No newline at end of file