Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use layout.path when rendering the Liquid layout #8069

Merged
merged 1 commit into from Mar 22, 2020

Conversation

ashmaroli
Copy link
Member

@ashmaroli ashmaroli commented Mar 22, 2020

  • This is a 馃悰 bug fix.

Summary

So that Jekyll's LiquidRenderer can correctly differentiate between layout from source vs layout from theme.

The bug can be identified in the --profile output:

| Filename                                     | Count |  Bytes |  Time |
+----------------------------------------------+-------+--------+-------+
| _posts/2020-03-20-welcome-to-jekyll.markdown |     1 |  1.68K | 0.181 |
| _layouts/default.html                        |     4 | 20.33K | 0.032 |
| minima-2.5.1/_includes/head.html             |     4 |  7.22K | 0.023 |
| feed.xml                                     |     1 |  4.00K | 0.007 |
| minima-2.5.1/_includes/header.html           |     4 |  3.96K | 0.004 |
| minima-2.5.1/_includes/footer.html           |     4 |  4.65K | 0.003 |
| _layouts/post.html                           |     1 |  2.45K | 0.003 |
| minima-2.5.1/_includes/social.html           |     4 |  1.56K | 0.002 |
| _layouts/home.html                           |     1 |  0.38K | 0.002 |
| _layouts/page.html                           |     1 |  0.67K | 0.000 |
+----------------------------------------------+-------+--------+-------+
| TOTAL (for 10 files)                         |    25 | 46.88K | 0.257 |

After fix:

| Filename                                     | Count |  Bytes |  Time |
+----------------------------------------------+-------+--------+-------+
| _posts/2020-03-22-welcome-to-jekyll.markdown |     1 |  1.68K | 0.150 |
| minima-2.5.1/_layouts/default.html           |     4 | 20.33K | 0.021 |
| minima-2.5.1/_includes/head.html             |     4 |  7.22K | 0.013 |
| feed.xml                                     |     1 |  4.00K | 0.012 |
| minima-2.5.1/_includes/header.html           |     4 |  3.96K | 0.004 |
| minima-2.5.1/_includes/footer.html           |     4 |  4.65K | 0.003 |
| minima-2.5.1/_includes/social.html           |     4 |  1.56K | 0.002 |
| minima-2.5.1/_layouts/post.html              |     1 |  2.45K | 0.002 |
| minima-2.5.1/_layouts/home.html              |     1 |  0.38K | 0.001 |
| minima-2.5.1/_layouts/page.html              |     1 |  0.67K | 0.000 |
+----------------------------------------------+-------+--------+-------+
| TOTAL (for 10 files)                         |    25 | 46.88K | 0.209 |

@ashmaroli ashmaroli added the fix label Mar 22, 2020
Copy link
Member

@DirtyF DirtyF left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

@ashmaroli
Copy link
Member Author

@jekyllbot: merge +fix

@jekyllbot jekyllbot merged commit a1401c6 into jekyll:master Mar 22, 2020
@jekyllbot jekyllbot added the bug label Mar 22, 2020
jekyllbot added a commit that referenced this pull request Mar 22, 2020
@ashmaroli ashmaroli deleted the renderer-layout-path branch March 22, 2020 16:04
@jekyll jekyll locked and limited conversation to collaborators Mar 22, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants