From 784a689b13ff622d3d583e9ef51c9b123c840f77 Mon Sep 17 00:00:00 2001 From: Ashwin Maroli Date: Wed, 1 Apr 2020 21:49:37 +0530 Subject: [PATCH] Simplify `Jekyll::Renderer#validate_layout` (#8064) Merge pull request 8064 --- lib/jekyll/renderer.rb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb index 7ecd1cb3..e7a7af87 100644 --- a/lib/jekyll/renderer.rb +++ b/lib/jekyll/renderer.rb @@ -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