Check both site and global setting for s3 enabled value.

Check both site and global setting for s3 enabled value.

diff --git a/app/jobs/regular/update_s3_inventory.rb b/app/jobs/regular/update_s3_inventory.rb
index 946ec47..3791ad3 100644
--- a/app/jobs/regular/update_s3_inventory.rb
+++ b/app/jobs/regular/update_s3_inventory.rb
@@ -5,7 +5,7 @@ module Jobs
   class UpdateS3Inventory < Jobs::Base
 
     def execute(args)
-      return unless SiteSetting.enable_s3_inventory? && SiteSetting.enable_s3_uploads?
+      return unless SiteSetting.enable_s3_inventory? && SiteSetting.Upload.enable_s3_uploads
 
       [:upload, :optimized].each do |type|
         s3_inventory = S3Inventory.new(Discourse.store.s3_helper, type)

GitHub sha: 9c78c182