New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rendering Liquid constructs in excerpts #6945

Merged
merged 1 commit into from Apr 26, 2018

Conversation

Projects
None yet
5 participants
@ashmaroli
Member

ashmaroli commented Apr 22, 2018

Fixes #6944

Background:

The bug occurred due to a miscalculation while implementing #6735
While Excerpt#render_with_liquid? called the method correctly on its container doc, doc.content by that time had already been rendered by Liquid and therefore returned false to query Utils.has_liquid_construct?(content)

Resolution:

The patch addresses the bug by implementing the Excerpt#render_with_liquid? directly to ensure Utils.has_liquid_construct?(content) is called on the excerpt's contents..

@ashmaroli ashmaroli added the fix label Apr 22, 2018

@ashmaroli ashmaroli requested a review from jekyll/build Apr 22, 2018

@DirtyF

DirtyF approved these changes Apr 22, 2018

Successfully tested with both pagination plugins with Liquid tags, variables and filters.

Thanks @ashmaroli for the quick fix.

@DirtyF DirtyF added this to the 3.8.1 milestone Apr 23, 2018

@oe

oe approved these changes Apr 23, 2018

@nebulousdog

This comment has been minimized.

nebulousdog commented Apr 26, 2018

thank you for the fix @ashmaroli. looking forward to this.

@DirtyF

This comment has been minimized.

Member

DirtyF commented Apr 26, 2018

@jekyllbot: merge +fix

@jekyllbot jekyllbot merged commit 7f9ac93 into jekyll:master Apr 26, 2018

3 checks passed

WIP ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jekyllbot jekyllbot added bug fix labels Apr 26, 2018

@ashmaroli ashmaroli deleted the ashmaroli:excerpt-liquid-patch branch Apr 26, 2018

kevinoid added a commit to kevinoid/kevinlocke.name that referenced this pull request Apr 29, 2018

Pin jekyll to 3.7.x until jekyll/jekyll#6945 is released
The site fails to properly build with jekyll 3.8 due to
jekyll/jekyll#6944.  The fix has been merged but not released.  Until it
is, stick with 3.7.x.

Signed-off-by: Kevin Locke <kevin@kevinlocke.name>

pathawks added a commit that referenced this pull request May 1, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment