diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-02-25 14:22:09 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-02-25 14:22:09 -0500 |
| commit | a7f8af528d0b3917f2960fa49d43b83ade0e7618 (patch) | |
| tree | 80106ad2246a52fdf6d6895db605184167be1636 /api | |
| parent | 34e6f10f22d57139cace3d71f9aaee9012cc42c4 (diff) | |
| parent | 25d599747e6a6286a5943d63d12eb8e1b9eaa99d (diff) | |
| download | chat-a7f8af528d0b3917f2960fa49d43b83ade0e7618.tar.gz chat-a7f8af528d0b3917f2960fa49d43b83ade0e7618.tar.bz2 chat-a7f8af528d0b3917f2960fa49d43b83ade0e7618.zip | |
Merge pull request #2250 from ZBoxApp/fix-deactivate
PLT-2123 Member show on Activate and Hide on deactivate from channel member li…
Diffstat (limited to 'api')
| -rw-r--r-- | api/user.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/api/user.go b/api/user.go index 7919da168..b7e6220d8 100644 --- a/api/user.go +++ b/api/user.go @@ -1510,6 +1510,10 @@ func UpdateActive(c *Context, user *model.User, active bool) *model.User { RevokeAllSession(c, user.Id) } + if extra := <-Srv.Store.Channel().ExtraUpdateByUser(user.Id, model.GetMillis()); extra.Err != nil { + c.Err = extra.Err + } + ruser := result.Data.([2]*model.User)[0] options := utils.Cfg.GetSanitizeOptions() options["passwordupdate"] = false |