Merge pull request #4 from paginagmbh/master

Several small fixes
tmy · Feb 8, 2014 · 5b34539 · 5b34539
2 parents c9e28c7 + 5a990f0
commit 5b34539
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/init.rb b/init.rb
@@ -4,7 +4,7 @@
   name 'Gemoji plugin'
   author 'Akinori Tomita'
   description 'Enable github style emoji'
-  version '0.0.1'
+  version '0.0.2'
   url 'https://github.com/tmy/redmine_gemoji'
   author_url 'https://github.com/tmy'
 end

diff --git a/lib/gemoji_plugin.rb b/lib/gemoji_plugin.rb
@@ -16,7 +16,7 @@ def self.included(base) # :nodoc:
     def inline_gemoji(text)
       text.gsub!(/:([a-z0-9\+\-_]+):/) do |match|
         if Emoji.names.include?($1)
-          '<img alt="' + $1 + '" height="20" src="'+ Redmine::Utils.relative_url_root + '/images/emoji/' + $1 + '.png" style="vertical-align:middle" width="20" title=":' + $1 + ':" />'
+          '<img alt="' + $1 + '" height="20" src="'+ Setting.protocol + "://" + Setting.host_name + Redmine::Utils.relative_url_root + '/images/emoji/' + $1 + '.png" style="vertical-align:middle" width="20" title=":' + $1 + ':" class="emoji" />'
         else
           match
         end