remove APP_CONFIG usage from avatar_or_gravatar_url

cmelbye · Apr 29, 2010 · d6c8909 · d6c8909
1 parent ca91e89
commit d6c8909
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/app/models/user/avatar.rb b/app/models/user/avatar.rb
@@ -28,11 +28,9 @@ def avatar_geometry(style = :original)
 
   def avatar_or_gravatar_url(size)
     if avatar_file_name
-      if APP_CONFIG['amazon_s3']['enabled']
-        avatar.url(size)
-      else
-        "http://#{APP_CONFIG['app_domain']}#{avatar.url(size)}"
-      end
+      url = avatar.url(size)
+      url = "http://#{Teambox.config.app_domain}" + url unless url.begins_with? 'http'
+      url
     else
       gravatar(size)
     end