dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix include tag: don't store variable value 

This fixes the bug reported in #1495 (comments).
This commit is contained in:
maul.esel 2013-11-14 20:53:59 +01:00
parent 8382a8b91b
commit 5e0af84993
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/jekyll/tags/include.rb
View File

@ -43,8 +43,8 @@ module Jekyll
params params
end end
def validate_file_name def validate_file_name(file)
if @file !~ /^[a-zA-Z0-9_\/\.-]+$/ || @file =~ /\.\// || @file =~ /\/\./ if file !~ /^[a-zA-Z0-9_\/\.-]+$/ || file =~ /\.\// || file =~ /\/\./
raise ArgumentError.new <<-eos raise ArgumentError.new <<-eos
Invalid syntax for include tag. File contains invalid characters or sequences: Invalid syntax for include tag. File contains invalid characters or sequences:
@ -82,7 +82,7 @@ eos
def retrieve_variable(context) def retrieve_variable(context)
if /\{\{([\w\-\.]+)\}\}/ =~ @file if /\{\{([\w\-\.]+)\}\}/ =~ @file
raise ArgumentError.new("No variable #{$1} was found in include tag") if context[$1].nil? raise ArgumentError.new("No variable #{$1} was found in include tag") if context[$1].nil?
@file = context[$1] context[$1]
end end
end end
@ -90,13 +90,13 @@ eos
dir = File.join(context.registers[:site].source, INCLUDES_DIR) dir = File.join(context.registers[:site].source, INCLUDES_DIR)
validate_dir(dir, context.registers[:site].safe) validate_dir(dir, context.registers[:site].safe)
retrieve_variable(context) file = retrieve_variable(context) || @file
validate_file_name validate_file_name(file)
file = File.join(dir, @file) path = File.join(dir, file)
validate_file(file, context.registers[:site].safe) validate_file(path, context.registers[:site].safe)
partial = Liquid::Template.parse(source(file, context)) partial = Liquid::Template.parse(source(path, context))
context.stack do context.stack do
context['include'] = parse_params(context) if @params context['include'] = parse_params(context) if @params