wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix symlink base path, don't allow symlinks in bare repos.

Browse Source
This commit is contained in:
Charles Pence
2013-03-16 22:00:19 -04:00
parent e21ec540c2
commit 90bbb8e348
5 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/file.rb
+2 -2
View File
@@ -44,8 +44,8 @@ module Gollum
def raw_data
return nil unless @blob
if @blob.is_symlink
new_path = @blob.symlink_target(self.path)
if !@wiki.repo.bare && @blob.is_symlink
new_path = @blob.symlink_target(::File.join(@wiki.repo.path, '..', self.path))
return IO.read(new_path) if new_path
end
lib/gollum/page.rb
+2 -2
View File
@@ -182,8 +182,8 @@ module Gollum
def raw_data
return nil unless @blob
if @blob.is_symlink
new_path = @blob.symlink_target(::File.join(@wiki.repo.path, self.path))
if !@wiki.repo.bare && @blob.is_symlink
new_path = @blob.symlink_target(::File.join(@wiki.repo.path, '..', self.path))
return IO.read(new_path) if new_path
end