diff --git a/lib/jekyll/tags/include.rb b/lib/jekyll/tags/include.rb index 26fedb0e..9efab578 100644 --- a/lib/jekyll/tags/include.rb +++ b/lib/jekyll/tags/include.rb @@ -23,7 +23,7 @@ module Jekyll case tag_name when 'include' @includes_dir = '_includes' - when 'relative_include' + when 'include_relative' @includes_dir = '' end @@ -106,7 +106,7 @@ eos case @tag_name when 'include' dir = File.join(File.realpath(context.registers[:site].source), @includes_dir) - when 'relative_include' + when 'include_relative' dir = File.join(File.realpath(context.registers[:site].source), File.dirname(context.registers[:page]["path"])) end file = render_variable(context) || @file @@ -152,4 +152,4 @@ eos end Liquid::Template.register_tag('include', Jekyll::Tags::IncludeTag) -Liquid::Template.register_tag('relative_include', Jekyll::Tags::RelativeIncludeTag) +Liquid::Template.register_tag('include_relative', Jekyll::Tags::IncludeTag) diff --git a/test/source/_posts/2014-09-02-relative-includes.markdown b/test/source/_posts/2014-09-02-relative-includes.markdown index 4afeffbc..748e47f2 100644 --- a/test/source/_posts/2014-09-02-relative-includes.markdown +++ b/test/source/_posts/2014-09-02-relative-includes.markdown @@ -2,24 +2,24 @@ title: Post layout: post include1: rel_include.html -include2: relative_includes/rel_include +include2: include_relative/rel_include include3: rel_INCLUDE include4: params include5: clude --- Liquid tests -- 1 {% relative_include relative_includes/{{ page.include1 }} %} -- 2 {% relative_include {{ page.include2 | append: '.html' }} %} -- 3 {% relative_include relative_includes/{{ page.include3 | downcase | append: '.html' }} %} +- 1 {% include_relative include_relative/{{ page.include1 }} %} +- 2 {% include_relative {{ page.include2 | append: '.html' }} %} +- 3 {% include_relative include_relative/{{ page.include3 | downcase | append: '.html' }} %} Whitespace tests -- 4 {% relative_include relative_includes/{{page.include1}} %} -- 5 {% relative_include relative_includes/{{ page.include1}} %} -- 6 {% relative_include relative_includes/{{ page.include3 | downcase | append: '.html'}} %} +- 4 {% include_relative include_relative/{{page.include1}} %} +- 5 {% include_relative include_relative/{{ page.include1}} %} +- 6 {% include_relative include_relative/{{ page.include3 | downcase | append: '.html'}} %} Parameters test -- 7 {% relative_include relative_includes/{{ page.include4 | append: '.html' }} var1='foo' var2='bar' %} +- 7 {% include_relative include_relative/{{ page.include4 | append: '.html' }} var1='foo' var2='bar' %} Partial variable test -- 8 {% relative_include relative_includes/rel_in{{ page.include5 }}.html %} +- 8 {% include_relative include_relative/rel_in{{ page.include5 }}.html %} diff --git a/test/source/_posts/relative_includes/params.html b/test/source/_posts/include_relative/params.html similarity index 100% rename from test/source/_posts/relative_includes/params.html rename to test/source/_posts/include_relative/params.html diff --git a/test/source/_posts/relative_includes/rel_include.html b/test/source/_posts/include_relative/rel_include.html similarity index 100% rename from test/source/_posts/relative_includes/rel_include.html rename to test/source/_posts/include_relative/rel_include.html