Merge pull request #422 from nature/sidebar_rendering_in_subfolders

Sidebar rendering in subfolders.
2012-07-09 09:19:11 -07:00
parent 89bc121d3f 1cc9d7b647
commit 8c30bb3a9f
18 changed files with 60 additions and 12 deletions
@@ -298,9 +298,8 @@ module Precious
    def show_page_or_file(fullpath)
      path         = extract_path(fullpath)
      name         = extract_name(fullpath)
-      # 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)
+      wiki_options = settings.wiki_options.merge({ :page_file_dir => path })
+      wiki         = Gollum::Wiki.new(settings.gollum_path, wiki_options)

      if page = wiki.page(name)
        @page = page