From 24dfa1b65790a350e7c8cca8bc3bf029982d7889 Mon Sep 17 00:00:00 2001
From: Maja Komel <maja.komel@gmail.com>
Date: Mon, 25 Jun 2018 17:16:01 +0200
Subject: [PATCH] Rename s3 vars, change condition when displaying s3 uploads

---
 app/assets/javascripts/discourse.js.es6               | 4 ++--
 app/assets/javascripts/discourse/lib/utilities.js.es6 | 2 +-
 app/views/common/_discourse_javascript.html.erb       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse.js.es6 b/app/assets/javascripts/discourse.js.es6
index e66abede413..928457b7518 100644
--- a/app/assets/javascripts/discourse.js.es6
+++ b/app/assets/javascripts/discourse.js.es6
@@ -33,8 +33,8 @@ const Discourse = Ember.Application.extend({
     // only relative urls
     if (Discourse.CDN && /^\/[^\/]/.test(url)) {
       url = Discourse.CDN + url;
-    } else if (Discourse.S3CDN) {
-      url = url.replace(Discourse.S3BaseUrl, Discourse.S3CDN);
+    } else if (Discourse.UploadCDN) {
+      url = url.replace(Discourse.UploadBaseUrl, Discourse.UploadCDN);
     }
     return url;
   },
diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6
index 50aa58d7cd4..4a003021f98 100644
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@@ -428,7 +428,7 @@ export function uploadLocation(url) {
   if (Discourse.CDN) {
     url = Discourse.getURLWithCDN(url);
     return /^\/\//.test(url) ? "http:" + url : url;
-  } else if (Discourse.SiteSettings.enable_s3_uploads) {
+  } else if (Discourse.UploadBaseUrl) {
     return "https:" + url;
   } else {
     var protocol = window.location.protocol + "//",
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index 150c88f3fea..8f6fe767845 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -56,9 +56,9 @@
     Discourse.HighlightJSPath = <%= HighlightJs.path.inspect.html_safe %>;
     <%- if SiteSetting.Upload.enable_s3_uploads %>
       <%- if SiteSetting.Upload.s3_cdn_url.present? %>
-    Discourse.S3CDN = '<%= SiteSetting.Upload.s3_cdn_url %>';
+    Discourse.UploadCDN = '<%= SiteSetting.Upload.s3_cdn_url %>';
       <%- end %>
-    Discourse.S3BaseUrl = '<%= SiteSetting.Upload.absolute_base_url %>';
+    Discourse.UploadBaseUrl = '<%= SiteSetting.Upload.absolute_base_url %>';
     <%- end %>
   })();
 </script>