From 9291431c611e7b24da46f4f3a6410d2917e03d5f Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Wed, 4 Jul 2012 12:24:35 -0600 Subject: [PATCH] Fix #413. --- lib/gollum/frontend/app.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb index 5593f79b..36088585 100644 --- a/lib/gollum/frontend/app.rb +++ b/lib/gollum/frontend/app.rb @@ -295,8 +295,9 @@ module Precious def show_page_or_file(fullpath) path = extract_path(fullpath) name = extract_name(fullpath) - wiki_options = settings.wiki_options.merge({ :page_file_dir => path }) - wiki = Gollum::Wiki.new(settings.gollum_path, wiki_options) + # This breaks headers, footers, and sidebars. + # wiki_options = settings.wiki_options.merge({ :page_file_dir => path }) + wiki = Gollum::Wiki.new(settings.gollum_path, settings.wiki_options) if page = wiki.page(name) @page = page