From eb5ea5f67a9f2251edf37dadc6610781d2e4a769 Mon Sep 17 00:00:00 2001 From: Gary Kim Date: Mon, 25 May 2020 13:01:49 +0800 Subject: [PATCH] Fix wrong milestone in webhook message (#11596) (#11611) Backport of #11596 Signed-off-by: Gary Kim Co-authored-by: zeripath Co-authored-by: techknowlogick --- models/issue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/issue.go b/models/issue.go index d9f8e929c..157ad48de 100644 --- a/models/issue.go +++ b/models/issue.go @@ -249,7 +249,7 @@ func (issue *Issue) loadReactions(e Engine) (err error) { } func (issue *Issue) loadMilestone(e Engine) (err error) { - if issue.Milestone == nil && issue.MilestoneID > 0 { + if (issue.Milestone == nil || issue.Milestone.ID != issue.MilestoneID) && issue.MilestoneID > 0 { issue.Milestone, err = getMilestoneByRepoID(e, issue.RepoID, issue.MilestoneID) if err != nil && !IsErrMilestoneNotExist(err) { return fmt.Errorf("getMilestoneByRepoID [repo_id: %d, milestone_id: %d]: %v", issue.RepoID, issue.MilestoneID, err)