From b4023942b40310e07db8b13c7477cf6ed810b3e6 Mon Sep 17 00:00:00 2001 From: Dawa Ometto Date: Mon, 26 Jan 2015 23:10:28 +0100 Subject: [PATCH] Remove page file dir from upload path --- lib/gollum/app.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb index 0afa05e3..05057df6 100644 --- a/lib/gollum/app.rb +++ b/lib/gollum/app.rb @@ -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)