Fix url not to be nil

2013-08-14 21:55:25 -03:00 · 2013-08-14 21:55:25 -03:00 · 4df8babb9a
parent 8fa9c51bf4
commit 4df8babb9a
1 changed files with 1 additions and 1 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -322,7 +322,7 @@ class User < ActiveRecord::Base
    if SiteSetting.allow_uploaded_avatars? && use_uploaded_avatar
      # the avatars might take a while to generate
      # so return the url of the original image in the meantime
-      uploaded_avatar_template.present? ? uploaded_avatar_template : uploaded_avatar.url
+      uploaded_avatar_template.present? ? uploaded_avatar_template : uploaded_avatar.try(:url)
    else
      User.gravatar_template(email)
    end