Merge branch 'master' into define-path-with-__dir__

This commit is contained in:
Frank Taillandier 2017-08-24 20:36:39 +02:00 committed by GitHub
commit 89929bf849
2 changed files with 26 additions and 12 deletions

View File

@ -1,8 +1,18 @@
## HEAD
## 2.3.0
### Minor Enhancements
* Use canonical_url specified in page if present #211
* Fix for image.path causing an invalid url error #228
* Ensure `site.data.authors` is properly formatted before attempting to retrieve author meta #227
* Convert author, image, and JSON-LD to dedicated drops #229
* Cache parsed template #231
### Documentation
* gems: is deprecated in current Jekyll version of github-pages #230
## 2.2.3

View File

@ -31,7 +31,7 @@ module Jekyll
def render(context)
@context = context
template.render!(payload, info)
SeoTag.template.render!(payload, info)
end
private
@ -63,19 +63,23 @@ module Jekyll
}
end
def template
@template ||= Liquid::Template.parse template_contents
end
def template_contents
@template_contents ||= begin
File.read(template_path).gsub(MINIFY_REGEX, "")
class << self
def template
@template ||= Liquid::Template.parse template_contents
end
end
def template_path
@template_path ||= begin
File.expand_path "./template.html", File.dirname(__FILE__)
private
def template_contents
@template_contents ||= begin
File.read(template_path).gsub(MINIFY_REGEX, "")
end
end
def template_path
@template_path ||= begin
File.expand_path "./template.html", File.dirname(__FILE__)
end
end
end
end