IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: allow users to pick no avatar

Browse Source
This commit is contained in:
Sam 2014-05-30 14:37:12 +10:00
parent 53c96395a7
commit 91b6459f2b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/users_controller.rb
View File

@ -365,7 +365,6 @@ class UsersController < ApplicationController
end end
def pick_avatar def pick_avatar
params.require(:upload_id)
user = fetch_user_from_params user = fetch_user_from_params
guardian.ensure_can_edit!(user) guardian.ensure_can_edit!(user)
upload_id = params[:upload_id] upload_id = params[:upload_id]
@ -373,7 +372,7 @@ class UsersController < ApplicationController
user.uploaded_avatar_id = upload_id user.uploaded_avatar_id = upload_id
# ensure we associate the custom avatar properly # ensure we associate the custom avatar properly
unless user.user_avatar.contains_upload?(upload_id) if upload_id && !user.user_avatar.contains_upload?(upload_id)
user.user_avatar.custom_upload_id = upload_id user.user_avatar.custom_upload_id = upload_id
end end
user.save! user.save!