summaryrefslogtreecommitdiffstats
path: root/app/user.go
diff options
context:
space:
mode:
Diffstat (limited to 'app/user.go')
-rw-r--r--app/user.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/user.go b/app/user.go
index d6ec9ddc1..48237f300 100644
--- a/app/user.go
+++ b/app/user.go
@@ -1534,6 +1534,12 @@ func (a *App) UpdateOAuthUserAttrs(userData io.Reader, user *model.User, provide
}
}
+ if user.DeleteAt > 0 {
+ // Make sure they are not disabled
+ user.DeleteAt = 0
+ userAttrsChanged = true
+ }
+
if userAttrsChanged {
var result store.StoreResult
if result = <-a.Srv.Store.User().Update(user, true); result.Err != nil {