From 51955e6e78911c27677849ab5555cc636ec64dcf Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 9 Dec 2014 14:31:49 +1100
Subject: [PATCH] FIX: add CDN support to emoji preview and toolbar

---
 plugins/emoji/assets/javascripts/emoji.js.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/emoji/assets/javascripts/emoji.js.erb b/plugins/emoji/assets/javascripts/emoji.js.erb
index 0dbaf8a364c..114237a7ab9 100644
--- a/plugins/emoji/assets/javascripts/emoji.js.erb
+++ b/plugins/emoji/assets/javascripts/emoji.js.erb
@@ -61,6 +61,10 @@ var urlFor = function(code) {
     url = Discourse.getURL('/plugins/emoji/images/' + code + '.png');
   }
 
+  if(url && url[0] !== 'h' && Discourse.CDN) {
+    url = Discourse.CDN + url;
+  }
+
   return url;
 }