From f6957f76586a5bba510f29a7ed965a606945c868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Cabe=C3=A7a?= Date: Mon, 11 Feb 2013 12:22:06 +0000 Subject: [PATCH 1/2] Fix image url for emoji. --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 196105f0..f5ad8330 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -160,7 +160,7 @@ module ApplicationHelper end def image_url(source) - root_url + path_to_image(source) + root_url.sub(/#{root_path}$/,'') + path_to_image(source) end alias_method :url_to_image, :image_url end From 157b03866124d562b78583fbcb38b3db8ac84d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Cabe=C3=A7a?= Date: Sun, 17 Feb 2013 13:02:22 +0000 Subject: [PATCH 2/2] Include Riyad Preukschas suggestions. --- app/helpers/application_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f5ad8330..f640d564 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -160,7 +160,8 @@ module ApplicationHelper end def image_url(source) - root_url.sub(/#{root_path}$/,'') + 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 end