X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7599f98957334d1924550205f7ba12a726de7eb0..691352136ab17e4a84394a5b80e758c8a1ce92a0:/app/helpers/user_helper.rb

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 7113cf1b2..6ef654fda 100644
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -35,7 +35,7 @@ module UserHelper
     if user.image_use_gravatar
       user_gravatar_url(user, options)
     else
-      "http://#{SERVER_URL}#{image_path(user.image.url)}"
+      image_url(user.image.url)
     end
   end
 
@@ -60,8 +60,8 @@ module UserHelper
   def user_gravatar_url(user, options = {})
     size = options[:size] || 100
     hash = Digest::MD5::hexdigest(user.email.downcase)
-    default_image_url = "http://#{SERVER_URL}#{image_path("users/images/large.png")}"
-    url = "http://www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}"
+    default_image_url = image_url("users/images/large.png")
+    url = "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}"
   end
 
   def user_gravatar_tag(user, options = {})