From 84e77e9078d34f1024b3002fea7533db5a8ce7d9 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Wed, 28 Jul 2021 11:26:09 +1000 Subject: [PATCH] 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. --- app/assets/javascripts/discourse/app/mixins/uppy-upload.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js index 0408b8892a..d6b5377c70 100644 --- a/app/assets/javascripts/discourse/app/mixins/uppy-upload.js +++ b/app/assets/javascripts/discourse/app/mixins/uppy-upload.js @@ -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();