Merge pull request #18 from LefsFlarey/issue/3675

lunny · web-flow · commit c511f1c6c36e · 2016-11-09T15:14:18.000+08:00
Fix 500 error caused by deleted users on issues (#3675)
diff --git a/models/issue.go b/models/issue.go
@@ -94,12 +94,12 @@ func (issue *Issue) loadAttributes(e Engine) (err error) {
 	if issue.Poster == nil {
 		issue.Poster, err = getUserByID(e, issue.PosterID)
 		if err != nil {
-			if IsErrUserNotExist(err) {
-				issue.PosterID = -1
-				issue.Poster = NewGhostUser()
-			} else {
+			issue.PosterID = -1
+			issue.Poster = NewGhostUser()
+			if !IsErrUserNotExist(err) {
 				return fmt.Errorf("getUserByID.(poster) [%d]: %v", issue.PosterID, err)
 			}
+			err = nil
 			return
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -94,12 +94,12 @@ func (issue *Issue) loadAttributes(e Engine) (err error) {`
`94`	`94`	`if issue.Poster == nil {`
`95`	`95`	`issue.Poster, err = getUserByID(e, issue.PosterID)`
`96`	`96`	`if err != nil {`
`97`		`- if IsErrUserNotExist(err) {`
`98`		`- issue.PosterID = -1`
`99`		`- issue.Poster = NewGhostUser()`
`100`		`- } else {`
	`97`	`+ issue.PosterID = -1`
	`98`	`+ issue.Poster = NewGhostUser()`
	`99`	`+ if !IsErrUserNotExist(err) {`
`101`	`100`	`return fmt.Errorf("getUserByID.(poster) [%d]: %v", issue.PosterID, err)`
`102`	`101`	`}`
	`102`	`+ err = nil`
`103`	`103`	`return`
`104`	`104`	`}`
`105`	`105`	`}`