Merge pull request #371 from bootstraponline/searchfix

Search fix (#348 with assert_not_match replacement).
2012-06-03 15:42:21 -07:00
parent b41f660fec cc67c8b68e
commit a4ecc9a187
2 changed files with 33 additions and 1 deletions
@@ -91,7 +91,7 @@ module Gollum
      fullpath = ::File.join(*[@wiki.page_file_dir, dir, path].compact)
      fullpath = fullpath[1..-1] if fullpath =~ /^\//

-      if index.current_tree && tree = index.current_tree / dir
+      if index.current_tree && tree = index.current_tree / (@wiki.page_file_dir || '/') / dir
        downpath = path.downcase.sub(/\.\w+$/, '')

        tree.blobs.each do |blob|