diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-04-17 15:08:56 -0400 |
| commit | 92d8fa4aa8af170d0018baed94a8787d06297e44 (patch) | |
| tree | dc5000a3584952c797c03bf4331282a5e1536848 /store/sql_user_store.go | |
| parent | 742bab6429aeb1b581275da3c06af99fe293baab (diff) | |
| parent | 30974533941e73f102505d07badf538cfdbbf3fc (diff) | |
| download | chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.gz chat-92d8fa4aa8af170d0018baed94a8787d06297e44.tar.bz2 chat-92d8fa4aa8af170d0018baed94a8787d06297e44.zip | |
Merge branch 'release-3.8'
Diffstat (limited to 'store/sql_user_store.go')
| -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 5ea04155d..91c27cf3e 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -1297,7 +1297,7 @@ func (us SqlUserStore) SearchNotInTeam(notInTeamId string, term string, options ON tm.UserId = Users.Id AND tm.TeamId = :NotInTeamId WHERE - tm.UserId IS NULL + (tm.UserId IS NULL OR tm.DeleteAt != 0) SEARCH_CLAUSE INACTIVE_CLAUSE ORDER BY Users.Username ASC |