mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	@@ -989,7 +989,7 @@ func VerifyActiveEmailCode(code, email string) *EmailAddress {
 | 
			
		||||
		data := com.ToStr(user.ID) + email + user.LowerName + user.Passwd + user.Rands
 | 
			
		||||
 | 
			
		||||
		if base.VerifyTimeLimitCode(data, minutes, prefix) {
 | 
			
		||||
			emailAddress := &EmailAddress{Email: email}
 | 
			
		||||
			emailAddress := &EmailAddress{UID: user.ID, Email: email}
 | 
			
		||||
			if has, _ := x.Get(emailAddress); has {
 | 
			
		||||
				return emailAddress
 | 
			
		||||
			}
 | 
			
		||||
 
 | 
			
		||||
@@ -201,7 +201,7 @@ func MakeEmailPrimary(email *EmailAddress) error {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Make sure the former primary email doesn't disappear.
 | 
			
		||||
	formerPrimaryEmail := &EmailAddress{Email: user.Email}
 | 
			
		||||
	formerPrimaryEmail := &EmailAddress{UID: user.ID, Email: user.Email}
 | 
			
		||||
	has, err = x.Get(formerPrimaryEmail)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user