From cdefb5801824981c15ec761ed114c885e28fbab9 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 21 Jul 2017 20:42:30 +0200
Subject: [PATCH] FIX: emoji-picker filtering false positive

---
 .../javascripts/discourse/components/emoji-picker.js.es6    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index 3d4a76df37c..c2e7dbb7d2b 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -187,8 +187,10 @@ export default Ember.Component.extend({
       $results.empty().hide();
       $list.show();
     } else {
-      const regexp = new RegExp(this.get("filter"), "g");
-      const filteredCodes = _.filter(emojis.concat(_.keys(extendedEmojiList())), code => regexp.test(code)).slice(0, 30);
+      const filterableEmojis = emojis.concat(_.keys(extendedEmojiList()));
+      const filteredCodes = _.filter(filterableEmojis, code => {
+        return code.indexOf(this.get("filter")) > -1;
+      }).slice(0, 30);
       $results.empty().html(
         _.map(filteredCodes, (code) => {
           const hasDiversity = isSkinTonableEmoji(code);