diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-11-09 14:42:26 -0800 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-11-09 14:42:26 -0800 |
| commit | 50dc39751358b32837011aa938f481233fd781f4 (patch) | |
| tree | 9201aab8326329b6f739cb6a66e40ceb3faf28c8 /app/user.go | |
| parent | 10c5a927cb619f1aa2a599cbe3667820f4766bda (diff) | |
| parent | 120fbed0f7715506cee8d2ba90f445eefcb072d7 (diff) | |
| download | chat-50dc39751358b32837011aa938f481233fd781f4.tar.gz chat-50dc39751358b32837011aa938f481233fd781f4.tar.bz2 chat-50dc39751358b32837011aa938f481233fd781f4.zip | |
Merge branch 'release-4.4'
Diffstat (limited to 'app/user.go')
| -rw-r--r-- | app/user.go | 6 |
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 { |