Merge pull request #956 from repotag/issue_955

Resolves #955.
2015-01-26 23:16:50 +01:00
parent c10c24d90d b4023942b4
commit e183260d0a
1 changed files with 2 additions and 1 deletions
@@ -178,7 +178,8 @@ module Precious
        tempfile = params[:file][:tempfile]
      end

-      dir      = wiki.per_page_uploads ? params[:upload_dest] : 'uploads'
+      # Remove page file dir prefix from upload path if necessary -- committer handles this itself
+      dir      = wiki.per_page_uploads ? params[:upload_dest].match(/^(#{wiki.page_file_dir}\/+)?(.*)/)[2] : 'uploads'
      ext      = ::File.extname(fullname)
      format   = ext.split('.').last || 'txt'
      filename = ::File.basename(fullname, ext)