Remove base_path in upload path determination.

2019-09-03 13:05:24 +02:00
parent 3740a7f6ff
commit 87902f258a
1 changed files with 3 additions and 1 deletions
@@ -198,12 +198,14 @@ module Precious
          tempfile = params[:file][:tempfile]
        end
        halt 500 unless tempfile.is_a? Tempfile
-        
+
        if wiki.per_page_uploads
          # remove base_url and gollum/* subpath if necessary
          dir = request.referer.
                  sub(request.base_url, '').
                  sub(/.*gollum\/[-\w]+\//, '')
+          # remove base path if it is set
+          dir = dir.sub(wiki.base_path, '') if wiki.base_path
          # remove file extension 
          dir = dir.sub(::File.extname(dir), '')
          dir = ::File.join("uploads", dir)