diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/repo.go | 5 | ||||
| -rw-r--r-- | models/user.go | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/models/repo.go b/models/repo.go index 58c099d4..b7458217 100644 --- a/models/repo.go +++ b/models/repo.go @@ -504,6 +504,11 @@ func initRepository(f string, u *User, repo *Repository, initReadme bool, repoLa } if len(fileName) == 0 { + // Re-fetch the repository from database before updating it (else it would + // override changes that were done earlier with sql) + if repo, err = GetRepositoryById(repo.Id); err != nil { + return err + } repo.IsBare = true repo.DefaultBranch = "master" return UpdateRepository(repo) diff --git a/models/user.go b/models/user.go index f16fbca3..2da0881c 100644 --- a/models/user.go +++ b/models/user.go @@ -477,6 +477,7 @@ func UpdateUser(u *User) error { } u.Avatar = avatar.HashEmail(u.AvatarEmail) + u.FullName = base.Sanitizer.Sanitize(u.FullName) _, err = x.Id(u.Id).AllCols().Update(u) return err } |