From 606c525099d98add4df1a628c484796681ce953e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 21 Jan 2014 23:50:16 -0500 Subject: [PATCH] Relative posts should never fail to build, even if @dir or @name is nil Fixes https://github.com/jekyll/jekyll/issues/1963 --- lib/jekyll/page.rb | 5 ++++- lib/jekyll/post.rb | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb index 469dbb53..5fd70eb2 100644 --- a/lib/jekyll/page.rb +++ b/lib/jekyll/page.rb @@ -126,7 +126,10 @@ module Jekyll # The path to the page source file, relative to the site source def relative_path - File.join(@dir, @name) + File.join([ + @dir.to_s, + @name.to_s + ].reject {|x| x.nil? || x.empty?}) end # Obtain destination path. diff --git a/lib/jekyll/post.rb b/lib/jekyll/post.rb index 23e131ee..6dc8e83b 100644 --- a/lib/jekyll/post.rb +++ b/lib/jekyll/post.rb @@ -133,7 +133,11 @@ module Jekyll # The path to the post source file, relative to the site source def relative_path - File.join(@dir, '_posts', @name) + File.join([ + @dir.to_s, + "_posts", + @name.to_s + ].reject {|x| x.nil? || x.empty?}) end # Compares Post objects. First compares the Post date. If the dates are