Make WordPress Core

Changeset 55832


Ignore:
Timestamp:
05/20/2023 04:03:23 AM (12 months ago)
Author:
desrosj
Message:

Editor: Restore shortcode support for block templates.

Follow up to [55761].

Props youknowriad, Clorith, desrosj, antpb, Otto42, johnbillion, jorbin, rmccue, timothyblynjacobs, mikeschroder, peterwilsoncc, audrasjb, matveb, noisysocks, xknown, ehtis, isabel_brison, talldanwp, gziolo, chriscct7, davidbaumwald.
Merges [55828] to the 5.9 branch.
See #58333.

Location:
branches/5.9
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/5.9

  • branches/5.9/package-lock.json

    r55774 r55832  
    37983798        },
    37993799        "@wordpress/block-library": {
    3800             "version": "6.0.29",
    3801             "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.29.tgz",
    3802             "integrity": "sha512-Wr5NIeyDbGgrOSH8V5cdRW9N6hI+OVZcSHfAEyMl0nDpVUTyGLsotGdVK1A+QHQHOFKANgBKqwmxbMKT/2IQyg==",
     3800            "version": "6.0.30",
     3801            "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-6.0.30.tgz",
     3802            "integrity": "sha512-mXG4a5kH9mHQ9JtkbSyOABdK0KfbNCs+s2HzlAQ82DqSNnwKuYqQKYjpBgdD3cyLk7CIZTjz02wxMAc+p/qqNw==",
    38033803            "requires": {
    38043804                "@babel/runtime": "^7.16.0",
     
    39793979        },
    39803980        "@wordpress/customize-widgets": {
    3981             "version": "2.0.30",
    3982             "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.30.tgz",
    3983             "integrity": "sha512-nJveEWuiiLhZ/zOPFcgavpPlLpq3ob7R5JVI52LNQJXWrdBE68gh5udVpSv1HmVY5FgrKiWTIVZCdZYD2hYFAg==",
     3981            "version": "2.0.31",
     3982            "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-2.0.31.tgz",
     3983            "integrity": "sha512-VkJww51L5NI3qjrw7p+pcUWKWie3Z7sNfyGMBUUuCDZxMHJMl8fb5k5IFJxFgV0nyesG8EVEexpiI7xqIlQ/lw==",
    39843984            "requires": {
    39853985                "@babel/runtime": "^7.16.0",
    39863986                "@wordpress/a11y": "^3.2.4",
    39873987                "@wordpress/block-editor": "^8.0.18",
    3988                 "@wordpress/block-library": "^6.0.29",
     3988                "@wordpress/block-library": "^6.0.30",
    39893989                "@wordpress/blocks": "^11.1.5",
    39903990                "@wordpress/components": "^19.2.3",
     
    41314131        },
    41324132        "@wordpress/edit-post": {
    4133             "version": "5.0.30",
    4134             "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.30.tgz",
    4135             "integrity": "sha512-SnvgP+TCTmaD1CT+66KG/21ykfLotmn4Hx0K0O2kYjEsw5LwvzFFgx3yWmo+vLi5zEe6Z8Rm+QvSfq6xXobL6w==",
     4133            "version": "5.0.31",
     4134            "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-5.0.31.tgz",
     4135            "integrity": "sha512-/FJ8OytoFoQBvIciLjL6SH31dE/nV5ir3FFrlaDu/+SMV8nKBH2gGS0BD7bTjqyhRXz9wQ0M+ivNPgVBsj2HGw==",
    41364136            "requires": {
    41374137                "@babel/runtime": "^7.16.0",
     
    41394139                "@wordpress/api-fetch": "^5.2.7",
    41404140                "@wordpress/block-editor": "^8.0.18",
    4141                 "@wordpress/block-library": "^6.0.29",
     4141                "@wordpress/block-library": "^6.0.30",
    41424142                "@wordpress/blocks": "^11.1.5",
    41434143                "@wordpress/components": "^19.2.3",
     
    41764176        },
    41774177        "@wordpress/edit-site": {
    4178             "version": "3.0.30",
    4179             "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.30.tgz",
    4180             "integrity": "sha512-XS60gWnzgprqiM79++PDY4MrpqUJkhM/AJ8tccLIFJEPsdAYziM/Ok5LKHYP9uFN0A/ScgDT9Zo7jk/ILchO7g==",
     4178            "version": "3.0.31",
     4179            "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-3.0.31.tgz",
     4180            "integrity": "sha512-BQw1vlrvhlfn4quTu3F208U8a4rWjW/+TqrRe41N31TmrCrQZgqgPJRBKvE3ypYncTd9zL6zKunmXy7XC5Yzdw==",
    41814181            "requires": {
    41824182                "@babel/runtime": "^7.16.0",
     
    41844184                "@wordpress/api-fetch": "^5.2.7",
    41854185                "@wordpress/block-editor": "^8.0.18",
    4186                 "@wordpress/block-library": "^6.0.29",
     4186                "@wordpress/block-library": "^6.0.30",
    41874187                "@wordpress/blocks": "^11.1.5",
    41884188                "@wordpress/components": "^19.2.3",
     
    42174217        },
    42184218        "@wordpress/edit-widgets": {
    4219             "version": "3.1.25",
    4220             "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.25.tgz",
    4221             "integrity": "sha512-s00vTrHAgXmOwwfX3WRu80doHfk8Lhk5lxxc0ESbZeGQjWvy0eNgT0mpHuA+AYH2yiojt/xVwWW4NBIWMF+YIA==",
     4219            "version": "3.1.26",
     4220            "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-3.1.26.tgz",
     4221            "integrity": "sha512-rdYG1kprYZqxlSle2Wd8FE/+XxqQWm1PfLYGAuXTHG2ywtb6yU9D+T+VdDJPiOGc51moogFD+vbCLnHpXrLYUw==",
    42224222            "requires": {
    42234223                "@babel/runtime": "^7.16.0",
     
    42254225                "@wordpress/api-fetch": "^5.2.7",
    42264226                "@wordpress/block-editor": "^8.0.18",
    4227                 "@wordpress/block-library": "^6.0.29",
     4227                "@wordpress/block-library": "^6.0.30",
    42284228                "@wordpress/blocks": "^11.1.5",
    42294229                "@wordpress/components": "^19.2.3",
  • branches/5.9/package.json

    r55774 r55832  
    8585        "@wordpress/block-directory": "3.0.30",
    8686        "@wordpress/block-editor": "8.0.18",
    87         "@wordpress/block-library": "6.0.29",
     87        "@wordpress/block-library": "6.0.30",
    8888        "@wordpress/block-serialization-default-parser": "4.2.3",
    8989        "@wordpress/blocks": "11.1.5",
     
    9191        "@wordpress/compose": "5.0.7",
    9292        "@wordpress/core-data": "4.0.11",
    93         "@wordpress/customize-widgets": "2.0.30",
     93        "@wordpress/customize-widgets": "2.0.31",
    9494        "@wordpress/data": "6.1.5",
    9595        "@wordpress/data-controls": "2.2.9",
     
    9898        "@wordpress/dom": "3.2.7",
    9999        "@wordpress/dom-ready": "3.2.3",
    100         "@wordpress/edit-post": "5.0.30",
    101         "@wordpress/edit-site": "3.0.30",
    102         "@wordpress/edit-widgets": "3.1.25",
     100        "@wordpress/edit-post": "5.0.31",
     101        "@wordpress/edit-site": "3.0.31",
     102        "@wordpress/edit-widgets": "3.1.26",
    103103        "@wordpress/editor": "12.0.22",
    104104        "@wordpress/element": "4.0.4",
  • branches/5.9/src/wp-includes/block-template.php

    r55774 r55832  
    238238    $content = $wp_embed->run_shortcode( $_wp_current_template_content );
    239239    $content = $wp_embed->autoembed( $content );
     240    $content = shortcode_unautop( $content );
     241    $content = do_shortcode( $content );
    240242    $content = do_blocks( $content );
    241243    $content = wptexturize( $content );
  • branches/5.9/src/wp-includes/blocks/template-part.php

    r52364 r55832  
    129129
    130130    // Run through the actions that are typically taken on the_content.
     131    $content                       = shortcode_unautop( $content );
     132    $content                       = do_shortcode( $content );
    131133    $seen_ids[ $template_part_id ] = true;
    132134    $content                       = do_blocks( $content );
     
    134136    $content = wptexturize( $content );
    135137    $content = convert_smilies( $content );
    136     $content = shortcode_unautop( $content );
    137138    $content = wp_filter_content_tags( $content );
    138     $content = do_shortcode( $content );
    139139
    140140    // Handle embeds for block template parts.
Note: See TracChangeset for help on using the changeset viewer.