From 34342ad0d8d1ff4c0c3b78f4d1635d52e52d992c Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 14 Dec 2017 13:20:58 +0800 Subject: [PATCH] FIX: `User#user_avatar` may be nil. --- app/controllers/user_avatars_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/user_avatars_controller.rb b/app/controllers/user_avatars_controller.rb index 0a59f9cdd28..dc868d48054 100644 --- a/app/controllers/user_avatars_controller.rb +++ b/app/controllers/user_avatars_controller.rb @@ -107,7 +107,7 @@ class UserAvatarsController < ApplicationController return redirect_to cdn_path(avatar_url) end - upload = Upload.find_by(id: upload_id) if user.user_avatar.contains_upload?(upload_id) + upload = Upload.find_by(id: upload_id) if user&.user_avatar&.contains_upload?(upload_id) upload ||= user.uploaded_avatar if user.uploaded_avatar_id == upload_id if user.uploaded_avatar && !upload