From 733b8af47b71f2d002d2c72105bb0ff69a153104 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 30 Oct 2018 12:53:57 +0100
Subject: [PATCH] FIX: Uploads didn't work for subfolder anymore

---
 app/views/layouts/_head.html.erb | 3 +++
 app/views/wizard/index.html.erb  | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 8edde92a2b..0b3039868e 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -15,6 +15,9 @@
 <% else %>
 <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=yes">
 <% end %>
+<%- if Discourse.base_uri.present? %>
+<meta name="discourse-base-uri" content="<%= Discourse.base_uri %>">
+<% end %>
 <%= canonical_link_tag %>
 <%= render_sitelinks_search_tag %>
 <link rel="search" type="application/opensearchdescription+xml" href="<%= Discourse.base_url %>/opensearch.xml" title="<%= SiteSetting.title %> Search">
diff --git a/app/views/wizard/index.html.erb b/app/views/wizard/index.html.erb
index 942e77bd92..ea5809bada 100644
--- a/app/views/wizard/index.html.erb
+++ b/app/views/wizard/index.html.erb
@@ -9,8 +9,6 @@
     <script src="<%= ExtraLocalesController.url("wizard") %>"></script>
     <%= csrf_meta_tags %>
 
-    <meta name="discourse-base-uri" content="<%= Discourse.base_uri %>">
-
     <%= render partial: "layouts/head" %>
     <title><%= t 'wizard.title' %></title>
   </head>