luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-21 16:40:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'develop' of github.com:gogits/gogs into feature/milestone

Browse source 
# Conflicts:
#	gogs.go
#	models/issue.go
#	templates/.VERSION
This commit is contained in:
Unknwon 2015-08-05 20:26:00 +08:00
commit 2c507667bf
25 changed files with 242 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

5
models/issue.go
View file

@ -74,7 +74,7 @@ func (i *Issue) BeforeSet(colName string, val xorm.Cell) {
func (i *Issue) GetPoster() (err error) {
i.Poster, err = GetUserById(i.PosterID)
if err == ErrUserNotExist {
if IsErrUserNotExist(err) {
i.Poster = &User{Name: "FakeUser"}
return nil
}
@ -108,8 +108,9 @@ func (i *Issue) GetAssignee() (err error) {
if i.AssigneeID == 0 {
return nil
}
i.Assignee, err = GetUserById(i.AssigneeID)
if err == ErrUserNotExist {
if IsErrUserNotExist(err) {
return nil
}
return err