From 3f1fca9463df27e8f795356ab6873d0d5bf4d634 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 22 Jun 2017 06:36:46 -0400 Subject: PLT-6759 Show deactivated users in GMs (#6703) * Show deactivated users in GMs * Fix runtime error when DMing deactivated user --- store/sql_user_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'store') 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()) -- cgit v1.2.3-1-g7c22