Make WordPress Core

Changeset 55831 for branches/6.0


Ignore:
Timestamp:
05/20/2023 04:02:53 AM (13 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 6.0 branch.
See #58333.

Location:
branches/6.0
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/6.0

  • branches/6.0/package-lock.json

    r54628 r55831  
    39973997        },
    39983998        "@wordpress/block-directory": {
    3999             "version": "3.4.15",
    4000             "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.4.15.tgz",
    4001             "integrity": "sha512-RLp1HoiwYdH5lLCJaI9zrfz8Nem/FOWi7MVv35LyLLgWO2XMcMPPxnJQYEyq6kYqG+dpO8pab5qUJNG/3FvU4Q==",
     3999            "version": "3.4.16",
     4000            "resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.4.16.tgz",
     4001            "integrity": "sha512-lU/zTmac7yMAqPQ4Dp5labQX/55+eATDj/qxNpELV8fVKnD1hG6rDt+TPqpsKAB3JBu6I99lOzuy+xVonAOT6A==",
    40024002            "requires": {
    40034003                "@babel/runtime": "^7.16.0",
     
    40104010                "@wordpress/core-data": "^4.4.5",
    40114011                "@wordpress/data": "^6.6.1",
    4012                 "@wordpress/edit-post": "^6.3.15",
     4012                "@wordpress/edit-post": "^6.3.16",
    40134013                "@wordpress/editor": "^12.5.10",
    40144014                "@wordpress/element": "^4.4.1",
     
    40694069        },
    40704070        "@wordpress/block-library": {
    4071             "version": "7.3.15",
    4072             "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-7.3.15.tgz",
    4073             "integrity": "sha512-UWKplojrgZuXWPUWNL/Q9jYgelfnqMdAtOIltcCK+dq03f3jWymYIZbZQAcqmYjXkK2unXLG77Drp3mVZXnKeQ==",
     4071            "version": "7.3.16",
     4072            "resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-7.3.16.tgz",
     4073            "integrity": "sha512-v9Pzhbv2eP8E3HNM6f/MRCFbL3VW7oLd0+6Q7uWFv9kBJ2PLKYmmGm4s8hp/iQCxGaDi3iyEF9qeowDxZz/d6Q==",
    40744074            "requires": {
    40754075                "@babel/runtime": "^7.16.0",
     
    42424242        },
    42434243        "@wordpress/customize-widgets": {
    4244             "version": "3.3.15",
    4245             "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-3.3.15.tgz",
    4246             "integrity": "sha512-yubgzsHGWjZwswzQnta8mYQD9vqKfC226/1cOtEUqCczVephax2D9GiQu/OEZ8gbZhjmq+fme4Ubtc5EUMjFnQ==",
     4244            "version": "3.3.16",
     4245            "resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-3.3.16.tgz",
     4246            "integrity": "sha512-HUMBYgNpTA+LjtSCVH7FG80Fx2tnr6ttvyfIzPJjxWCjkeCx7m2OcbKTygO0egBchwcs1ujLCHv5BzMlAnFjww==",
    42474247            "requires": {
    42484248                "@babel/runtime": "^7.16.0",
    42494249                "@wordpress/block-editor": "^8.5.10",
    4250                 "@wordpress/block-library": "^7.3.15",
     4250                "@wordpress/block-library": "^7.3.16",
    42514251                "@wordpress/blocks": "^11.5.3",
    42524252                "@wordpress/components": "^19.8.5",
     
    43764376        },
    43774377        "@wordpress/edit-post": {
    4378             "version": "6.3.15",
    4379             "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-6.3.15.tgz",
    4380             "integrity": "sha512-u1ibxfjNZ/QBu6b+mDatvZYmdutcxUvmfTPrzJKHpD/Nt7kEAo/oWJsWZBkZp7jmNuE59Iod17pMh/Ygao3xmQ==",
     4378            "version": "6.3.16",
     4379            "resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-6.3.16.tgz",
     4380            "integrity": "sha512-haJff3ZougNwE7hLSYrm/cL66Tviqit5jGIGkxQ6A13/MwB44Y8+pMPf4kZvxbiV/ikoIvJixFEiK2AFENwj8A==",
    43814381            "requires": {
    43824382                "@babel/runtime": "^7.16.0",
     
    43844384                "@wordpress/api-fetch": "^6.3.1",
    43854385                "@wordpress/block-editor": "^8.5.10",
    4386                 "@wordpress/block-library": "^7.3.15",
     4386                "@wordpress/block-library": "^7.3.16",
    43874387                "@wordpress/blocks": "^11.5.3",
    43884388                "@wordpress/components": "^19.8.5",
     
    44134413        },
    44144414        "@wordpress/edit-site": {
    4415             "version": "4.3.15",
    4416             "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-4.3.15.tgz",
    4417             "integrity": "sha512-TeyXmxLNnrR788zGHDj6KcO+CB5m+bV+JDg5TUsyF8Jy9ggxeK+NS2uB369ytyTqJX/G5HtX90bvGnz/lmJthQ==",
     4415            "version": "4.3.16",
     4416            "resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-4.3.16.tgz",
     4417            "integrity": "sha512-wm3gz6G6eqKcqq4weqP6CI/Q3UBAagqto0y6nlfQm3oU5oS/muN00aKBahnQYBfjAFUIETGguVfVyg51jL0QOQ==",
    44184418            "requires": {
    44194419                "@babel/runtime": "^7.16.0",
     
    44214421                "@wordpress/api-fetch": "^6.3.1",
    44224422                "@wordpress/block-editor": "^8.5.10",
    4423                 "@wordpress/block-library": "^7.3.15",
     4423                "@wordpress/block-library": "^7.3.16",
    44244424                "@wordpress/blocks": "^11.5.3",
    44254425                "@wordpress/components": "^19.8.5",
     
    44544454        },
    44554455        "@wordpress/edit-widgets": {
    4456             "version": "4.3.15",
    4457             "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-4.3.15.tgz",
    4458             "integrity": "sha512-9WH5Dh7V5uChvTwsbwh8Gf2az3rCzTfL4XHw9TSrE0dhnKb7V+InttcdrUhbW1367U4+1lV1ZZnexFMeOkQb3Q==",
     4456            "version": "4.3.16",
     4457            "resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-4.3.16.tgz",
     4458            "integrity": "sha512-llArSm4oCBFO7zoNJ3eRor0vIPwxk790aaH3Q1Y9NFnKs+wsxNEGvIZc/3JjhndX7ayumxuodFIlk8MycvsSnQ==",
    44594459            "requires": {
    44604460                "@babel/runtime": "^7.16.0",
    44614461                "@wordpress/api-fetch": "^6.3.1",
    44624462                "@wordpress/block-editor": "^8.5.10",
    4463                 "@wordpress/block-library": "^7.3.15",
     4463                "@wordpress/block-library": "^7.3.16",
    44644464                "@wordpress/blocks": "^11.5.3",
    44654465                "@wordpress/components": "^19.8.5",
  • branches/6.0/package.json

    r54628 r55831  
    8282        "@wordpress/autop": "3.6.1",
    8383        "@wordpress/blob": "3.6.1",
    84         "@wordpress/block-directory": "3.4.15",
     84        "@wordpress/block-directory": "3.4.16",
    8585        "@wordpress/block-editor": "8.5.10",
    86         "@wordpress/block-library": "7.3.15",
     86        "@wordpress/block-library": "7.3.16",
    8787        "@wordpress/block-serialization-default-parser": "4.6.1",
    8888        "@wordpress/blocks": "11.5.3",
     
    9090        "@wordpress/compose": "5.4.1",
    9191        "@wordpress/core-data": "4.4.5",
    92         "@wordpress/customize-widgets": "3.3.15",
     92        "@wordpress/customize-widgets": "3.3.16",
    9393        "@wordpress/data": "6.6.1",
    9494        "@wordpress/data-controls": "2.6.1",
     
    9797        "@wordpress/dom": "3.6.1",
    9898        "@wordpress/dom-ready": "3.6.1",
    99         "@wordpress/edit-post": "6.3.15",
    100         "@wordpress/edit-site": "4.3.15",
    101         "@wordpress/edit-widgets": "4.3.15",
     99        "@wordpress/edit-post": "6.3.16",
     100        "@wordpress/edit-site": "4.3.16",
     101        "@wordpress/edit-widgets": "4.3.16",
    102102        "@wordpress/editor": "12.5.10",
    103103        "@wordpress/element": "4.4.1",
  • branches/6.0/src/wp-includes/block-template.php

    r55773 r55831  
    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/6.0/src/wp-includes/blocks/template-part.php

    r53157 r55831  
    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.