Merge branch 'master' into PLT-92

This commit is contained in:
=Corey Hulen
2015-09-17 09:21:56 -07:00
973 changed files with 89408 additions and 55 deletions

View File

@@ -439,7 +439,7 @@ func (s SqlChannelStore) GetExtraMembers(channelId string, limit int) StoreChann
if err != nil {
result.Err = model.NewAppError("SqlChannelStore.GetExtraMembers", "We couldn't get the extra info for channel members", "channel_id="+channelId+", "+err.Error())
} else {
for i, _ := range members {
for i := range members {
members[i].Sanitize(utils.SanitizeOptions)
}
result.Data = members