mirror of
https://github.com/go-gitea/gitea
synced 2025-07-22 18:28:37 +00:00
Added GetUserByIDCtx. (#17602)
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
@@ -1392,7 +1392,12 @@ func getUserByID(e db.Engine, id int64) (*User, error) {
|
||||
|
||||
// GetUserByID returns the user object by given ID if exists.
|
||||
func GetUserByID(id int64) (*User, error) {
|
||||
return getUserByID(db.GetEngine(db.DefaultContext), id)
|
||||
return GetUserByIDCtx(db.DefaultContext, id)
|
||||
}
|
||||
|
||||
// GetUserByIDCtx returns the user object by given ID if exists.
|
||||
func GetUserByIDCtx(ctx context.Context, id int64) (*User, error) {
|
||||
return getUserByID(db.GetEngine(ctx), id)
|
||||
}
|
||||
|
||||
// GetUserByName returns user by given name.
|
||||
@@ -1577,7 +1582,7 @@ func GetUserByEmailContext(ctx context.Context, email string) (*User, error) {
|
||||
return nil, err
|
||||
}
|
||||
if has {
|
||||
return getUserByID(db.GetEngine(ctx), emailAddress.UID)
|
||||
return GetUserByIDCtx(ctx, emailAddress.UID)
|
||||
}
|
||||
|
||||
// Finally, if email address is the protected email address:
|
||||
|
Reference in New Issue
Block a user