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

Fixes #1963
jekyll · Jan 22, 2014 · 606c525 · tamouse · Jan 30, 2014 · tamouse
1 parent 30d8743
commit 606c525
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/jekyll/page.rb b/lib/jekyll/page.rb
@@ -126,7 +126,10 @@ def path
 
     # 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
@@ -133,7 +133,11 @@ def path
 
     # 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