add tests for hub export

1 files changed, 7 insertions, 19 deletions

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 0dfc1552f..ea5f41fb7 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -4,25 +4,13 @@ module UsersHelper
       image_tag user_image(user), :alt => "", :class => "preview", :width => size, :height => size
   end
 
-  def gravatar_hash(user)
-    Digest::MD5.hexdigest( user.email)
-  end
-  def gravatar_url( user)
-    "http://www.gravatar.com/avatar/#{gravatar_hash(user)}?d=404"
-  end
-  def user_image(user)
-    begin
-      gravatar_resource = RestClient.get( gravatar_url( user)){|response, request, result| response }
-    rescue
-      # Happens if network is not available
-      return 'icons/user.png'
-    end
-    if gravatar_resource.code == 404
-      # Happens if user has not registered to gravatar
-      'icons/user.png'
-    else
-      gravatar_url( user)
-    end
+  def user_default_avatar
+    return "#{authenticated_root_url}#{image_path('icons/user.png')}" if Rails.application.config.relative_url_root.blank?
+
+    relative_url_root = Rails.application.config.relative_url_root.gsub( /\//, '')
+    "#{authenticated_root_url}#{image_path('icons/user.png')}".
+      sub( Regexp.new("/#{relative_url_root}/#{relative_url_root}/"), "/#{relative_url_root}/").
+      sub( Regexp.new("/#{relative_url_root}//#{relative_url_root}/"), "/#{relative_url_root}/")
   end
 
 end