New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't include the theme's includes_path if it is nil. #5780

Merged
merged 5 commits into from Jan 17, 2017

Conversation

Projects
None yet
4 participants
@parkr
Member

parkr commented Jan 17, 2017

Fixes #5639.

@parkr parkr requested a review from benbalter Jan 17, 2017

@parkr parkr added this to the 3.4 milestone Jan 17, 2017

@parkr parkr requested a review from pathawks Jan 17, 2017

@parkr parkr added the fix label Jan 17, 2017

Show outdated Hide outdated lib/jekyll/site.rb
@@ -435,7 +435,7 @@ def configure_theme
private
def configure_include_paths
@includes_load_paths = Array(in_source_dir(config["includes_dir"].to_s))
@includes_load_paths << theme.includes_path if self.theme
@includes_load_paths << theme.includes_path if self.theme && theme.includes_path

This comment has been minimized.

@benbalter

benbalter Jan 17, 2017

Contributor

Does this need to be self.theme? If not, can they both be just theme?

@benbalter

benbalter Jan 17, 2017

Contributor

Does this need to be self.theme? If not, can they both be just theme?

@pathawks

This comment has been minimized.

Show comment
Hide comment
@pathawks

pathawks Jan 17, 2017

Member

Is there a test for this?

Member

pathawks commented Jan 17, 2017

Is there a test for this?

parkr added some commits Jan 17, 2017

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jan 17, 2017

Member

Is there a test for this?

@pathawks Yes! Pushed it up.

Member

parkr commented Jan 17, 2017

Is there a test for this?

@pathawks Yes! Pushed it up.

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jan 17, 2017

Member

@jekyllbot: merge +bug

Member

parkr commented Jan 17, 2017

@jekyllbot: merge +bug

@jekyllbot jekyllbot merged commit b5d1be4 into master Jan 17, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jekyllbot jekyllbot added bug fix labels Jan 17, 2017

@jekyllbot jekyllbot deleted the dont-include-in-load-path-if-nil branch Jan 17, 2017

jekyllbot added a commit that referenced this pull request Jan 17, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment