Merge pull request #4053 from xfalcox/patch-5

FIX: Image Lightbox on Subfolder Install

lib/file_store/local_store.rb

@@ -34,10 +34,14 @@ module FileStore
       "#{Discourse.asset_host}#{relative_base_url}"
     end
 
-    def relative_base_url
+    def upload_path
       "/uploads/#{RailsMultisite::ConnectionManagement.current_db}"
     end
 
+    def relative_base_url
+      "#{Discourse.base_uri}#{upload_path}"
+    end
+
     def external?
       false
     end
@@ -57,7 +61,7 @@ module FileStore
     end
 
     def get_path_for(type, upload_id, sha, extension)
-      "#{relative_base_url}/#{super(type, upload_id, sha, extension)}"
+      "#{upload_path}/#{super(type, upload_id, sha, extension)}"
     end
 
     def copy_file(file, path)