Merge branch 'release-4.6'

1 files changed, 19 insertions, 1 deletions

diff --git a/app/team.go b/app/team.go
index bda418081..71eb00569 100644
--- a/app/team.go
+++ b/app/team.go
@@ -622,7 +622,7 @@ func (a *App) LeaveTeam(team *model.Team, user *model.User, requestorId string)
 				l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err)
 			}
 		} else {
-			if err := a.PostRemoveFromChannelMessage(user.Id, user, channel); err != nil {
+			if err := a.postRemoveFromTeamMessage(user, channel); err != nil {
 				l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err)
 			}
 		}
@@ -674,6 +674,24 @@ func (a *App) postLeaveTeamMessage(user *model.User, channel *model.Channel) *mo
 	return nil
 }
 
+func (a *App) postRemoveFromTeamMessage(user *model.User, channel *model.Channel) *model.AppError {
+	post := &model.Post{
+		ChannelId: channel.Id,
+		Message:   fmt.Sprintf(utils.T("api.team.remove_user_from_team.removed"), user.Username),
+		Type:      model.POST_REMOVE_FROM_TEAM,
+		UserId:    user.Id,
+		Props: model.StringInterface{
+			"removedUsername": user.Username,
+		},
+	}
+
+	if _, err := a.CreatePost(post, channel, false); err != nil {
+		return model.NewAppError("postRemoveFromTeamMessage", "api.channel.post_user_add_remove_message_and_forget.error", nil, err.Error(), http.StatusInternalServerError)
+	}
+
+	return nil
+}
+
 func (a *App) InviteNewUsersToTeam(emailList []string, teamId, senderId string) *model.AppError {
 	if len(emailList) == 0 {
 		err := model.NewAppError("InviteNewUsersToTeam", "api.team.invite_members.no_one.app_error", nil, "", http.StatusBadRequest)