Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Remove additional setting check for uppy-upload (#13867) 

Because the enable_s3_uploads setting may be false for
some sites but GlobalSetting.use_s3? is true, we need to
remove this additional check in uppy-upload. The hidden
enable_direct_s3_uploads setting is sufficient.
This commit is contained in:
Martin Brennan 2021-07-28 11:26:09 +10:00 committed by GitHub
parent 53b33a3a7c
commit 84e77e9078
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/mixins/uppy-upload.js
View File

@ -151,10 +151,8 @@ export default Mixin.create({
this._reset();
});
if (
this.siteSettings.enable_s3_uploads &&
this.siteSettings.enable_direct_s3_uploads // hidden setting like enable_experimental_image_uploader
) {
// hidden setting like enable_experimental_image_uploader
if (this.siteSettings.enable_direct_s3_uploads) {
this._useS3Uploads();
} else {
this._useXHRUploads();