Merge commit '4f677f627ef569be8'

This commit is contained in:
Tom Preston-Werner 2009-01-02 12:24:46 -08:00
commit 9c52bccafb
1 changed files with 6 additions and 2 deletions

View File

@ -14,7 +14,11 @@ module Jekyll
Dir.chdir(File.join(Jekyll.source, '_includes')) do
choices = Dir['**/*'].reject { |x| File.symlink?(x) }
if choices.include?(@file)
File.read(@file)
source = File.read(@file)
partial = Liquid::Template.parse(source)
context.stack do
partial.render(context)
end
else
"Included file '#{@file}' not found in _includes directory"
end
@ -24,4 +28,4 @@ module Jekyll
end
Liquid::Template.register_tag('include', Jekyll::IncludeTag)
Liquid::Template.register_tag('include', Jekyll::IncludeTag)