dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Relative posts should never fail to build, even if @dir or @name is nil 

Fixes https://github.com/jekyll/jekyll/issues/1963
This commit is contained in:
Parker Moore 2014-01-21 23:50:16 -05:00
parent 30d8743853
commit 606c525099
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/jekyll/page.rb
View File

@ -126,7 +126,10 @@ module Jekyll
# The path to the page source file, relative to the site source # The path to the page source file, relative to the site source
def relative_path def relative_path
File.join(@dir, @name) File.join([
@dir.to_s,
@name.to_s
].reject {|x| x.nil? || x.empty?})
end end
# Obtain destination path. # Obtain destination path.

6
lib/jekyll/post.rb
View File

@ -133,7 +133,11 @@ module Jekyll
# The path to the post source file, relative to the site source # The path to the post source file, relative to the site source
def relative_path def relative_path
File.join(@dir, '_posts', @name) File.join([
@dir.to_s,
"_posts",
@name.to_s
].reject {|x| x.nil? || x.empty?})
end end
# Compares Post objects. First compares the Post date. If the dates are # Compares Post objects. First compares the Post date. If the dates are