diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-06-22 06:36:46 -0400 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-06-22 11:36:46 +0100 |
| commit | 3f1fca9463df27e8f795356ab6873d0d5bf4d634 (patch) | |
| tree | eb023486f6bac6a8156633fcc6adb5f4bd360583 /store | |
| parent | ac4e9909fa4f3f6c6a0d1e537d6039115d07a5e0 (diff) | |
| download | chat-3f1fca9463df27e8f795356ab6873d0d5bf4d634.tar.gz chat-3f1fca9463df27e8f795356ab6873d0d5bf4d634.tar.bz2 chat-3f1fca9463df27e8f795356ab6873d0d5bf4d634.zip | |
PLT-6759 Show deactivated users in GMs (#6703)
* Show deactivated users in GMs
* Fix runtime error when DMing deactivated user
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_user_store.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go index d18da8df8..e6054365c 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -546,7 +546,7 @@ func (us SqlUserStore) GetProfilesInChannel(channelId string, offset int, limit var users []*model.User - query := "SELECT Users.* FROM Users, ChannelMembers WHERE ChannelMembers.ChannelId = :ChannelId AND Users.Id = ChannelMembers.UserId AND Users.DeleteAt = 0 ORDER BY Users.Username ASC LIMIT :Limit OFFSET :Offset" + query := "SELECT Users.* FROM Users, ChannelMembers WHERE ChannelMembers.ChannelId = :ChannelId AND Users.Id = ChannelMembers.UserId ORDER BY Users.Username ASC LIMIT :Limit OFFSET :Offset" if _, err := us.GetReplica().Select(&users, query, map[string]interface{}{"ChannelId": channelId, "Offset": offset, "Limit": limit}); err != nil { result.Err = model.NewLocAppError("SqlUserStore.GetProfilesInChannel", "store.sql_user.get_profiles.app_error", nil, err.Error()) |