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

Merge pull request #1613 from maul-esel/fix-variable-include 

fix error with variable as file name
This commit is contained in:
Parker Moore 2013-10-04 10:36:26 -07:00
parent 04c0c2d0bb b00849544b
commit b850c01605
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,11 +20,6 @@ module Jekyll
def initialize(tag_name, markup, tokens) def initialize(tag_name, markup, tokens)
super super
@file, @params = markup.strip.split(' ', 2); @file, @params = markup.strip.split(' ', 2);
validate_syntax
end
def validate_syntax
validate_file_name
validate_params if @params validate_params if @params
end end
@ -96,6 +91,8 @@ eos
validate_dir(dir, context.registers[:site].safe) validate_dir(dir, context.registers[:site].safe)
retrieve_variable(context) retrieve_variable(context)
validate_file_name
file = File.join(dir, @file) file = File.join(dir, @file)
validate_file(file, context.registers[:site].safe) validate_file(file, context.registers[:site].safe)