diff options
Diffstat (limited to 'models/user.go')
| -rw-r--r-- | models/user.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/models/user.go b/models/user.go index 5c43a23a..23ed5ae8 100644 --- a/models/user.go +++ b/models/user.go @@ -16,7 +16,6 @@ import ( _ "image/jpeg" "image/png" "os" - "path" "path/filepath" "strings" "time" @@ -211,7 +210,7 @@ func (u *User) GenerateRandomAvatar() error { if err != nil { return fmt.Errorf("RandomImage: %v", err) } - if err = os.MkdirAll(path.Dir(u.CustomAvatarPath()), os.ModePerm); err != nil { + if err = os.MkdirAll(filepath.Dir(u.CustomAvatarPath()), os.ModePerm); err != nil { return fmt.Errorf("MkdirAll: %v", err) } fw, err := os.Create(u.CustomAvatarPath()) @@ -599,7 +598,12 @@ func ChangeUserName(u *User, newUserName string) (err error) { return ErrUserAlreadyExist{newUserName} } - return os.Rename(UserPath(u.LowerName), UserPath(newUserName)) + err = ChangeUsernameInPullRequests(u.Name, newUserName) + if err != nil { + return fmt.Errorf("ChangeUsernameInPullRequests: %v", err) + } + + return os.Rename(UserPath(u.Name), UserPath(newUserName)) } func updateUser(e Engine, u *User) error { |