From 36319d64584aae3210e59f76fb80f64c89f2ccdc Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Thu, 12 Mar 2015 11:03:11 -0700
Subject: [PATCH] Fix crash when sending :invalid_emoji:

---
 js/views/conversation_view.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index ec0d7f244..c5412ad6f 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -159,7 +159,11 @@
             return str.replace(emoji.rx_colons, function(m){
                 var idx = m.substr(1, m.length-2);
                 var val = emoji.map.colons[idx];
-                return emoji.data[val][0][0];
+                if (val) {
+                    return emoji.data[val][0][0];
+                } else {
+                    return m;
+                }
             });
         }
     });