include: fix 'no implicit conversion of nil to String' #5750
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is when either 'dir' or 'file' is nil.
parkr
commented
Jan 10, 2017
| @@ -163,7 +163,7 @@ def load_cached_partial(path, context) | |||
| end | |||
|
|
|||
| def valid_include_file?(path, dir, safe) | |||
| !(outside_site_source?(path, dir, safe) || !File.exist?(path)) | |||
| !(outside_site_source?(path, dir, safe) || !File.file?(path)) | |||
There was a problem hiding this comment.
We don't want this to be a directory.
There was a problem hiding this comment.
why not !File.directory?(path) ?
There was a problem hiding this comment.
I believe checking to see if it's a file is easier to read - affirmations are easier for us to grok than negations.
There was a problem hiding this comment.
checking to see if it's a file
but its !File.file?(path) instead of File.file?(path)...
There was a problem hiding this comment.
yeah, If anything I'd write this as:
!outside_site_source?(path, dir, safe) && File.file?(path)There was a problem hiding this comment.
Works for me! Updated to Ben's suggestion.
|
@jekyllbot: merge +bug |
|
Are we releasing a v3.3.2? Thought the |
17 tasks
4 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is when either 'dir' or 'file' is
niland passedFile.join.Backtrace