From b50872497e75e06a988ff8e0ea155483206a97b4 Mon Sep 17 00:00:00 2001
From: Bart Kamphorst <bart@kamphorst.com>
Date: Mon, 12 Nov 2018 11:57:28 +0100
Subject: [PATCH] Loosen route replacement regex to allow for dashes in routes.

---
 lib/gollum/app.rb                    | 2 +-
 lib/gollum/templates/layout.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index f790e193..ec14fdfa 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -196,7 +196,7 @@ module Precious
           # remove base_url and gollum/* subpath if necessary
           dir = request.referer.
                   sub(request.base_url, '').
-                  sub(/.*gollum\/\w+\//, '')
+                  sub(/.*gollum\/[-\w]+\//, '')
           # remove file extension 
           dir = dir.sub(::File.extname(dir), '')
           dir = ::File.join("uploads", dir)
diff --git a/lib/gollum/templates/layout.mustache b/lib/gollum/templates/layout.mustache
index 4788ad3f..fca9fa18 100644
--- a/lib/gollum/templates/layout.mustache
+++ b/lib/gollum/templates/layout.mustache
@@ -19,7 +19,7 @@
 	var uploadDest = 'uploads';
 	var perPageUploads = '{{per_page_uploads}}';
 	if (perPageUploads == 'true') {
-	  uploadDest = uploadDest + window.location.pathname.replace(/.*gollum\/\w+\//, "/").replace(/\.[^/.]+$/, "")
+	  uploadDest = uploadDest + window.location.pathname.replace(/.*gollum\/[-\w]+\//, "/").replace(/\.[^/.]+$/, "")
 	}
 	{{#page}}
 	  var pageFullPath = '{{url_path}}';