github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Upload Logos Step

Browse Source
This commit is contained in:
Robin Ward
2016-09-08 16:58:07 -04:00
parent c94e6f1b96
commit af83c8dc14
18 changed files with 223 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/uploads_controller.rb
View File

@ -7,7 +7,7 @@ class UploadsController < ApplicationController
file = params[:file] || params[:files].try(:first)
url = params[:url]
client_id = params[:client_id]
synchronous = is_api? && params[:synchronous]
synchronous = (current_user.staff? || is_api?) && params[:synchronous]
if type == "avatar"
if SiteSetting.sso_overrides_avatar || !SiteSetting.allow_uploaded_avatars