Perform less expensive operation first

This commit is contained in:
Alfred Xing 2014-11-27 10:00:29 -08:00
parent 02f281eef3
commit b6d81c58df
2 changed files with 2 additions and 4 deletions

View File

@ -172,8 +172,7 @@ module Jekyll
# #
# Returns true if file needs to be regenerated # Returns true if file needs to be regenerated
def regenerate? def regenerate?
site.metadata.regenerate?(site.in_source_dir(relative_path)) || data['regenerate'] || site.metadata.regenerate?(site.in_source_dir(relative_path))
data['regenerate']
end end
# Determine whether the file should be placed into layouts. # Determine whether the file should be placed into layouts.

View File

@ -109,8 +109,7 @@ module Jekyll
# #
# Returns true if the document needs to be regenerated. # Returns true if the document needs to be regenerated.
def regenerate? def regenerate?
site.metadata.regenerate?(path, write?) || data['regenerate'] || site.metadata.regenerate?(path, write?)
data['regenerate']
end end
# Determine whether the file should be placed into layouts. # Determine whether the file should be placed into layouts.