From b6d81c58df04991fc4b1f8eeaa46a23cb3af6be5 Mon Sep 17 00:00:00 2001 From: Alfred Xing Date: Thu, 27 Nov 2014 10:00:29 -0800 Subject: [PATCH] Perform less expensive operation first --- lib/jekyll/convertible.rb | 3 +-- lib/jekyll/document.rb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index 2c0d240e..d6ddfde6 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -172,8 +172,7 @@ module Jekyll # # Returns true if file needs to be regenerated def regenerate? - site.metadata.regenerate?(site.in_source_dir(relative_path)) || - data['regenerate'] + data['regenerate'] || site.metadata.regenerate?(site.in_source_dir(relative_path)) end # Determine whether the file should be placed into layouts. diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 356ce397..5b1b79ab 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -109,8 +109,7 @@ module Jekyll # # Returns true if the document needs to be regenerated. def regenerate? - site.metadata.regenerate?(path, write?) || - data['regenerate'] + data['regenerate'] || site.metadata.regenerate?(path, write?) end # Determine whether the file should be placed into layouts.