Fix user profile avatar on his page

randomecho · Oct 14, 2013 · 74b9a62 · 74b9a62
1 parent 638b519
commit 74b9a62
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -92,6 +92,7 @@ def display_user_avatar(user, size='avatar', klass='alignleft')
                     else
                       user.resource.upload.avatar.url
                     end
+      return if avatar_path.nil?
       avatar_url = File.join(this_blog.base_url, avatar_path)
     elsif user.twitter_profile_image.present?
       avatar_url = user.twitter_profile_image

diff --git a/spec/controllers/admin/profiles_controller_spec.rb b/spec/controllers/admin/profiles_controller_spec.rb
@@ -3,7 +3,6 @@
 describe Admin::ProfilesController do
   render_views
   let!(:blog) { create(:blog) }
-
   let(:alice) { create(:user, login: 'alice', profile: create(:profile_admin, label: Profile::ADMIN)) }
 
   describe "#index" do