From 6930c8919e3b889e4bc948fe2a5ae045a9d9defb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 23 Mar 2015 21:35:53 +0100
Subject: [PATCH] FIX: duplicate emojis in emoji-toolbar

---
 app/assets/javascripts/discourse/lib/emoji/emoji.js.erb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb b/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb
index 5abf50e18df..8a1206d886a 100644
--- a/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb
+++ b/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb
@@ -14,7 +14,6 @@ Discourse.Dialect.registerEmoji = function(code, url) {
 
 Discourse.Emoji.list = function(){
   var list = emoji.slice(0);
-  _.each(aliases, function(v,k){ list.push(k); });
   _.each(extendedEmoji, function(v,k){ list.push(k); });
   return list;
 };
@@ -72,7 +71,6 @@ Discourse.Emoji.urlFor = urlFor = function(code) {
   }
 
   if(!url && emojiHash.hasOwnProperty(code)) {
-    if (aliases.hasOwnProperty(code)) { code = aliases[code]; }
     url = Discourse.getURL('/images/emoji/' + set + '/' + code + '.png');
   }