fix 500: E-mail already used in user settings page

diff --git a/cmd/web.go b/cmd/web.go
index 56df5fe721cbcf59ddb75ae3d38ebd5da235769e..ddb34829b7373e6a8620143f42fae59178d1619d 100644 (file)
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -74,11 +74,11 @@ func checkVersion() {
 
        // Check dependency version.
        checkers := []VerChecker{
-               {"github.com/Unknwon/macaron", macaron.Version, "0.4.7"},
+               {"github.com/Unknwon/macaron", macaron.Version, "0.4.9"},
                {"github.com/macaron-contrib/binding", binding.Version, "0.0.4"},
                {"github.com/macaron-contrib/csrf", csrf.Version, "0.0.1"},
-               {"github.com/macaron-contrib/i18n", i18n.Version, "0.0.4"},
-               {"github.com/macaron-contrib/session", session.Version, "0.1.0"},
+               {"github.com/macaron-contrib/i18n", i18n.Version, "0.0.5"},
+               {"github.com/macaron-contrib/session", session.Version, "0.1.1"},
        }
        for _, c := range checkers {
                ver := strings.Join(strings.Split(c.Version(), ".")[:3], ".")

diff --git a/gogs.go b/gogs.go
index 04141dad3dd7125b6f00a0a13b7dc1f0fb3994c7..c3038aad6d8897c6ba65e0b6059778e29681394b 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
        "github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.10.1222 Beta"
+const APP_VER = "0.5.10.1229 Beta"
 
 func init() {
        runtime.GOMAXPROCS(runtime.NumCPU())

diff --git a/models/user.go b/models/user.go
index 651168eba28e2fcbcf5cebf726590082a52ffef6..f16fbca34465f8eb9f4074aec3797fe1534c5dc3 100644 (file)
--- a/models/user.go
+++ b/models/user.go
@@ -453,7 +453,7 @@ func ChangeUserName(u *User, newUserName string) (err error) {
 
 // UpdateUser updates user's information.
 func UpdateUser(u *User) error {
-       has, err := x.Where("id!=?", u.Id).And("email=?", u.Email).Get(new(User))
+       has, err := x.Where("id!=?", u.Id).And("type=?", INDIVIDUAL).And("email=?", u.Email).Get(new(User))
        if err != nil {
                return err
        } else if has {

diff --git a/templates/.VERSION b/templates/.VERSION
index 801600a4bd7e025d87fc947ec14f9e0a33df5d23..ea5da339f7f53ac34b0524e2e3222b72dbb799ea 100644 (file)
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.10.1222 Beta
\ No newline at end of file
+0.5.10.1229 Beta
\ No newline at end of file