fix confirmable changes

1 files changed, 5 insertions, 2 deletions

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index ad45433c1..82ecb3273 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -1,11 +1,14 @@
 module UsersHelper
 
   def user_gravatar_image_tag(user)
-    gravatar_image_tag user.email, :alt => user.name, :class => "preview", :gravatar => { :default => user_default_avatar, :size => 64 }
+    gravatar_image_tag user.email, :alt => user.name, :class => "preview", :gravatar => { :default => user_default_avatar , :size => 64 }
   end
 
   def user_default_avatar
-    "#{root_url}#{image_path('icons/user.png')}"
+    return "#{root_url}#{image_path('icons/user.png')}" if Rails.application.config.relative_url_root.blank?
+
+    relative_url_root = Rails.application.config.relative_url_root.sub( /\//, '')
+    "#{root_url}#{image_path('icons/user.png')}".sub( Regexp.new("/#{relative_url_root}/#{relative_url_root}/"), "/#{relative_url_root}/")
   end
 
 end