From 4ada8aacd424d22fccd1f9f160b8bf91e489f6cb Mon Sep 17 00:00:00 2001
From: krjn <51929404+krjn@users.noreply.github.com>
Date: Thu, 18 Jul 2019 12:54:01 +0000
Subject: [PATCH] MM-16389 - complement for emoji_icon issue (#11650)

---
 app/post_metadata.go      | 1 -
 app/post_metadata_test.go | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/post_metadata.go b/app/post_metadata.go
index bef2d0ae18..6959b44018 100644
--- a/app/post_metadata.go
+++ b/app/post_metadata.go
@@ -63,7 +63,6 @@ func (a *App) OverrideIconURLIfEmoji(post *model.Post) {
 		return
 	}
 	emojiName := prop.(string)
-	delete(post.Props, model.POST_PROPS_OVERRIDE_ICON_EMOJI)
 
 	if !*a.Config().ServiceSettings.EnablePostIconOverride || emojiName == "" {
 		return
diff --git a/app/post_metadata_test.go b/app/post_metadata_test.go
index 6177fa2f6d..cae456474a 100644
--- a/app/post_metadata_test.go
+++ b/app/post_metadata_test.go
@@ -267,6 +267,8 @@ func TestPreparePostForClient(t *testing.T) {
 
 			s, _ := clientPost.Props[model.POST_PROPS_OVERRIDE_ICON_URL]
 			assert.EqualValues(t, url, s)
+			s, _ = clientPost.Props[model.POST_PROPS_OVERRIDE_ICON_EMOJI]
+			assert.EqualValues(t, emoji, s)
 		})
 
 		t.Run("overrides icon URL", func(t *testing.T) {
@@ -274,6 +276,8 @@ func TestPreparePostForClient(t *testing.T) {
 
 			s, _ := clientPost.Props[model.POST_PROPS_OVERRIDE_ICON_URL]
 			assert.EqualValues(t, overridenUrl, s)
+			s, _ = clientPost.Props[model.POST_PROPS_OVERRIDE_ICON_EMOJI]
+			assert.EqualValues(t, emoji, s)
 		})
 
 	})