From 9f65658c5c2cf89e0c0808cf423004c1585e57f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 24 Mar 2017 01:08:12 +0100
Subject: [PATCH] register_emoji should work with subfolder installs

---
 lib/plugin/instance.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index e6b8c047565..5ef7278c6b1 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -15,6 +15,7 @@ class Plugin::CustomEmoji
 
   def self.register(name, url)
     @@cache_key = Digest::SHA1.hexdigest(cache_key + name)[0..10]
+    url = Discourse.base_uri + url if url[/^\/[^\/]/]
     emojis[name] = url
   end
 end