Merge pull request #2954 from cabeca/fix-image-url-emoji

Fix image url for emoji.
2013-03-05 05:52:01 -08:00 · 2013-03-05 05:52:01 -08:00 · c2ba868c9b
parent f22488f726 157b038661
commit c2ba868c9b
1 changed files with 2 additions and 1 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -164,7 +164,8 @@ module ApplicationHelper
  end

  def image_url(source)
-    root_url + path_to_image(source)
+    # prevent relative_root_path being added twice (it's part of root_url and path_to_image)
+    root_url.sub(/#{root_path}$/, path_to_image(source))
  end

  alias_method :url_to_image, :image_url