Skip to content

Commit

Permalink
FIX: Remove additional setting check for uppy-upload (#13867)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
martin-brennan committed Jul 28, 2021
1 parent 53b33a3 commit 84e77e9
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions app/assets/javascripts/discourse/app/mixins/uppy-upload.js
Expand Up @@ -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();
Expand Down

0 comments on commit 84e77e9

Please sign in to comment.