Move join into setupsession

Author: lunny

models/issue.go

@@ -1210,7 +1210,8 @@ func (opts *IssuesOptions) setupSession(sess *xorm.Session) {
 	}
 
 	if opts.IsArchived != util.OptionalBoolNone {
-		sess.And(builder.Eq{"repository.is_archived": opts.IsArchived.IsTrue()})
+		sess.Join("INNER", "repository", "`issue`.repo_id = `repository`.id").
+			And(builder.Eq{"repository.is_archived": opts.IsArchived.IsTrue()})
 	}
 
 	if opts.LabelIDs != nil {
@@ -1292,8 +1293,6 @@ func GetRepoIDsForIssuesOptions(opts *IssuesOptions, user *User) ([]int64, error
 	sess := x.NewSession()
 	defer sess.Close()
 
-	sess.Join("INNER", "repository", "`issue`.repo_id = `repository`.id")
-
 	opts.setupSession(sess)
 
 	accessCond := accessibleRepositoryCondition(user)