lib/nanoc/data_sources/filesystem.rb in nanoc-3.7.5 vs lib/nanoc/data_sources/filesystem.rb in nanoc-3.8.0

- old
+ new

@@ -117,11 +117,11 @@ else raise 'meta_filename and content_filename are both nil' end # Get modification times - meta_mtime = meta_filename ? File.stat(meta_filename).mtime : nil + meta_mtime = meta_filename ? File.stat(meta_filename).mtime : nil content_mtime = content_filename ? File.stat(content_filename).mtime : nil if meta_mtime && content_mtime mtime = meta_mtime > content_mtime ? meta_mtime : content_mtime elsif meta_mtime mtime = meta_mtime @@ -168,10 +168,10 @@ unless [0, 1].include?(content_filenames.size) raise "Found #{content_filenames.size} content files for #{key}; expected 0 or 1" end # Reorder elements and convert to extnames - filenames[0] = meta_filenames[0] ? 'yaml' : nil + filenames[0] = meta_filenames[0] ? 'yaml' : nil filenames[1] = content_filenames[0] ? ext_of(content_filenames[0])[1..-1] || '' : nil end grouped_filenames end