Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements

Conflicts:
	web/react/components/popover_list_members.jsx
	web/react/components/user_profile.jsx

1 files changed, 12 insertions, 4 deletions

diff --git a/web/web.go b/web/web.go
index 7ab50a073..00e00b3b9 100644
--- a/web/web.go
+++ b/web/web.go
@@ -971,12 +971,20 @@ func incomingWebhook(c *api.Context, w http.ResponseWriter, r *http.Request) {
 	post := &model.Post{UserId: hook.UserId, ChannelId: channel.Id, Message: text}
 	post.AddProp("from_webhook", "true")
 
-	if len(overrideUsername) != 0 && utils.Cfg.ServiceSettings.EnablePostUsernameOverride {
-		post.AddProp("override_username", overrideUsername)
+	if utils.Cfg.ServiceSettings.EnablePostUsernameOverride {
+		if len(overrideUsername) != 0 {
+			post.AddProp("override_username", overrideUsername)
+		} else {
+			post.AddProp("override_username", model.DEFAULT_WEBHOOK_USERNAME)
+		}
 	}
 
-	if len(overrideIconUrl) != 0 && utils.Cfg.ServiceSettings.EnablePostIconOverride {
-		post.AddProp("override_icon_url", overrideIconUrl)
+	if utils.Cfg.ServiceSettings.EnablePostIconOverride {
+		if len(overrideIconUrl) != 0 {
+			post.AddProp("override_icon_url", overrideIconUrl)
+		} else {
+			post.AddProp("override_icon_url", model.DEFAULT_WEBHOOK_ICON)
+		}
 	}
 
 	if !c.HasPermissionsToChannel(pchan, "createIncomingHook") && channel.Type != model.CHANNEL_OPEN {