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.

Sign up for GitHub

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

Jump to bottom

Process template part shortcodes before blocks (#50801) #50805

Merged
merged 2 commits into from
May 20, 2023
Merged

Process template part shortcodes before blocks (#50801) #50805

merged 2 commits into from
May 20, 2023

Commits on May 20, 2023

  1. Process template part shortcodes before blocks (#50801) 

    * Process shortcodes before processing blocks so that dynamic blocks, by default, do not have shortcodes expanded

* Revert "Process shortcodes before processing blocks so that dynamic blocks, by default, do not have shortcodes expanded"

This reverts commit 00374e0.

* Process shortcodes before processing blocks so that dynamic blocks, by default, do not have shortcodes expanded
    @antpb @priethor
    antpb authored and priethor committed May 20, 2023
    Configuration menu
    Copy the full SHA
    84e1bac View commit details
    Browse the repository at this point in the history

  2. Fix wrong conflict resolution when cherry picking

    @priethor
    priethor authored May 20, 2023
    Configuration menu
    Copy the full SHA
    f3999b5 View commit details
    Browse the repository at this point in the history