Merge pull request #452 from repotag/fix_gollum1978

Fix absolute path includes from a subdir

lib/gollum-lib/filter/tags.rb

@@ -120,8 +120,9 @@ def parse_tag_parts(tag)
   def process_include_tag(tag)
     len = INCLUDE_TAG.length
     return html_error('Cannot process include directive: no page name given') if tag.length <= len
-    page_name          = tag[len..-1]
-    resolved_page_name = ::File.join(@markup.dir, page_name)
+    page_path = Pathname.new(tag[len..-1])
+    resolved_page = page_path.relative? ? (Pathname.new(@markup.dir) + page_path) : page_path
+    resolved_page_name = resolved_page.cleanpath.to_s
     if @markup.include_levels > 0
       page = find_page_or_file_from_path(resolved_page_name)
       if page

test/test_markup.rb

@@ -578,6 +578,13 @@
     assert_html_equal("<p>hello<br /></p><p>&lt;java</p><p>script&gt;alert(99);</p>", page1.formatted_data)
   end
 
+  test "include directive with absolute path from subdir" do
+    @wiki.write_page("/subdir/page1", :textile, "hello\n[[include:/a/very/long/path/to/page2]]\n", commit_details)
+    @wiki.write_page("/a/very/long/path/to/page2", :textile, "success", commit_details)
+    page1 = @wiki.page("/subdir/page1")
+    assert_html_equal("<p>hello<br/></p><p>success</p>", page1.formatted_data)
+  end
+
   test "include directive with very long absolute path and relative include" do
     @wiki.write_page("page1", :textile, "hello\n[[include:/a/very/long/path/to/page2]]\n", commit_details)
     @wiki.write_page("/a/very/long/path/to/page2", :textile, "goodbye\n[[include:object]]", commit_details)