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

Fix image url for emoji.

Merge pull request #2954 from cabeca/fix-image-url-emoji
Fix image url for emoji.
c2ba868c · Dmitriy Zaporozhets · f22488f7 · 157b0386 · c2ba868c
Commit c2ba868c authored Mar 05, 2013 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

app/helpers/application_helper.rb app/helpers/application_helper.rb +2 -1

No files found.
--- 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