wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Loosen route replacement regex to allow for dashes in routes.

Browse Source
This commit is contained in:
Bart Kamphorst
2018-11-12 11:57:28 +01:00
parent 64c4ee9c05
commit b50872497e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/app.rb
+1 -1
View File
@@ -196,7 +196,7 @@ module Precious
# remove base_url and gollum/* subpath if necessary # remove base_url and gollum/* subpath if necessary
dir = request.referer. dir = request.referer.
sub(request.base_url, ''). sub(request.base_url, '').
sub(/.*gollum\/\w+\//, '') sub(/.*gollum\/[-\w]+\//, '')
# remove file extension # remove file extension
dir = dir.sub(::File.extname(dir), '') dir = dir.sub(::File.extname(dir), '')
dir = ::File.join("uploads", dir) dir = ::File.join("uploads", dir)
lib/gollum/templates/layout.mustache
+1 -1
View File
@@ -19,7 +19,7 @@
var uploadDest = 'uploads'; var uploadDest = 'uploads';
var perPageUploads = '{{per_page_uploads}}'; var perPageUploads = '{{per_page_uploads}}';
if (perPageUploads == 'true') { if (perPageUploads == 'true') {
uploadDest = uploadDest + window.location.pathname.replace(/.*gollum\/\w+\//, "/").replace(/\.[^/.]+$/, "") uploadDest = uploadDest + window.location.pathname.replace(/.*gollum\/[-\w]+\//, "/").replace(/\.[^/.]+$/, "")
} }
{{#page}} {{#page}}
var pageFullPath = '{{url_path}}'; var pageFullPath = '{{url_path}}';