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

Simplify `Jekyll::Renderer#validate_layout` (#8064) 

Merge pull request 8064
This commit is contained in:
Ashwin Maroli 2020-04-01 21:49:37 +05:30 committed by GitHub
parent 46cffe89b8
commit 784a689b13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/jekyll/renderer.rb
View File

@ -174,16 +174,10 @@ module Jekyll
# layout - the layout to check
# Returns nothing
def validate_layout(layout)
if invalid_layout?(layout)
Jekyll.logger.warn(
"Build Warning:",
"Layout '#{document.data["layout"]}' requested "\
"in #{document.relative_path} does not exist."
)
elsif !layout.nil?
layout_source = layout.path.start_with?(site.source) ? :site : :theme
Jekyll.logger.debug "Layout source:", layout_source
end
return unless invalid_layout?(layout)
Jekyll.logger.warn "Build Warning:", "Layout '#{document.data["layout"]}' requested " \
"in #{document.relative_path} does not exist."
end
# Render layout content into document.output