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

Merge pull request #1976 from jekyll/fix-pagination-issue 

Relative posts should never fail to build, even if @dir or @name is nil
This commit is contained in:
Matt Rogers 2014-02-13 12:39:23 -06:00
parent ec93743659 1176fc6f57
commit ac7bed335a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jekyll/page.rb
View File

@ -126,7 +126,7 @@ 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, @name].map(&:to_s).reject(&:empty?))
end end
# Obtain destination path. # Obtain destination path.

2
lib/jekyll/post.rb
View File

@ -123,7 +123,7 @@ 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, "_posts", @name].map(&:to_s).reject(&: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