<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[54248] trunk/src: Shortcodes: Reverse wrapping of `apply_shortcodes()` and `do_shortcode()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/54248">54248</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/54248","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-20 10:29:55 +0000 (Tue, 20 Sep 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Shortcodes: Reverse wrapping of `apply_shortcodes()` and `do_shortcode()`.
This changeset reverses the wrapping of `apply_shortcodes()` and `do_shortcode()` such that `apply_shortcodes()` is now the recommended function. In addition:
- Calls to `do_shortcode()` have been changed to `apply_shortcodes()`.
- Some default filter callbacks have been changed from `'do_shortcode'` to `'apply_shortcodes'`.
- Applicable documentation has been updated to refer to `apply_shortcodes()` instead.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/47004">[47004]</a>.
Props SergeyBiryukov, rafiahmedd, namithjawahar, peterwilsoncc, costdev.
Fixes <a href="https://core.trac.wordpress.org/ticket/55883">#55883</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpincludesblocktemplatephp">trunk/src/wp-includes/block-template.php</a></li>
<li><a href="#trunksrcwpincludesclasswpembedphp">trunk/src/wp-includes/class-wp-embed.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesshortcodesphp">trunk/src/wp-includes/shortcodes.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgettextphp">trunk/src/wp-includes/widgets/class-wp-widget-text.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2022-09-20 09:57:43 UTC (rev 54247)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2022-09-20 10:29:55 UTC (rev 54248)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3788,7 +3788,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $styles .= sprintf( '<link rel="stylesheet" href="%s" />', $style );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html = do_shortcode( $parsed );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = apply_shortcodes( $parsed );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_scripts;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3861,7 +3861,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> setup_postdata( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed = do_shortcode( $shortcode );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed = apply_shortcodes( $shortcode );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $parsed ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span></span></pre></div>
<a id="trunksrcwpincludesblocktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/block-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-template.php 2022-09-20 09:57:43 UTC (rev 54247)
+++ trunk/src/wp-includes/block-template.php 2022-09-20 10:29:55 UTC (rev 54248)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +242,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = convert_smilies( $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = shortcode_unautop( $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = wp_filter_content_tags( $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = do_shortcode( $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = apply_shortcodes( $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( ']]>', ']]>', $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Wrap block template in .wp-site-blocks to allow for specific descendant styles
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-embed.php 2022-09-20 09:57:43 UTC (rev 54247)
+++ trunk/src/wp-includes/class-wp-embed.php 2022-09-20 10:29:55 UTC (rev 54248)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Since the [embed] shortcode needs to be run earlier than other shortcodes,
</span><span class="cx" style="display: block; padding: 0 10px"> * this function removes all existing shortcodes, registers the [embed] shortcode,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * calls do_shortcode(), and then re-registers the old shortcodes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * calls apply_shortcodes(), and then re-registers the old shortcodes.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $shortcode_tags
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_shortcode( 'embed', array( $this, 'shortcode' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Do the shortcode (only the [embed] one is registered).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = do_shortcode( $content, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = apply_shortcodes( $content, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Put the original shortcodes back.
</span><span class="cx" style="display: block; padding: 0 10px"> $shortcode_tags = $orig_shortcode_tags;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The do_shortcode() callback function.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The apply_shortcodes() callback function.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Attempts to convert a URL into embed HTML. Starts by checking the URL against the regex of
</span><span class="cx" style="display: block; padding: 0 10px"> * the registered embed handlers. If none of the regex matches and it's enabled, then the URL
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2022-09-20 09:57:43 UTC (rev 54247)
+++ trunk/src/wp-includes/default-filters.php 2022-09-20 10:29:55 UTC (rev 54248)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,7 +228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'widget_block_content', 'do_blocks', 9 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'widget_block_content', 'wp_filter_content_tags' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'widget_block_content', 'do_shortcode', 11 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'widget_block_content', 'apply_shortcodes', 11 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'block_type_metadata', 'wp_migrate_old_typography_shape' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -605,7 +605,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Shortcodes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'the_content', 'do_shortcode', 11 ); // AFTER wpautop().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'the_content', 'apply_shortcodes', 11 ); // AFTER wpautop().
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Media.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_playlist_scripts', 'wp_playlist_scripts' );
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2022-09-20 09:57:43 UTC (rev 54247)
+++ trunk/src/wp-includes/media.php 2022-09-20 10:29:55 UTC (rev 54248)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2296,7 +2296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $describedby,
</span><span class="cx" style="display: block; padding: 0 10px"> $style,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $class ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_shortcode( $content ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ apply_shortcodes( $content ),
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<figcaption %sclass="wp-caption-text">%s</figcaption>',
</span><span class="cx" style="display: block; padding: 0 10px"> $caption_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2309,7 +2309,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id,
</span><span class="cx" style="display: block; padding: 0 10px"> $style,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $class ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- str_replace( '<img ', '<img ' . $describedby, do_shortcode( $content ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ str_replace( '<img ', '<img ' . $describedby, apply_shortcodes( $content ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p %sclass="wp-caption-text">%s</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> $caption_id,
</span></span></pre></div>
<a id="trunksrcwpincludesshortcodesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/shortcodes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/shortcodes.php 2022-09-20 09:57:43 UTC (rev 54247)
+++ trunk/src/wp-includes/shortcodes.php 2022-09-20 10:29:55 UTC (rev 54248)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * To apply shortcode tags to content:
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * $out = do_shortcode( $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * $out = apply_shortcodes( $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @link https://developer.wordpress.org/plugins/shortcodes/
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,29 +171,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Searches content for shortcodes and filter shortcodes through their hooks.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * This function is an alias for do_shortcode().
- *
- * @since 5.4.0
- *
- * @see do_shortcode()
- *
- * @param string $content Content to search for shortcodes.
- * @param bool $ignore_html When true, shortcodes inside HTML elements will be skipped.
- * Default false.
- * @return string Content with shortcodes filtered out.
- */
-function apply_shortcodes( $content, $ignore_html = false ) {
- return do_shortcode( $content, $ignore_html );
-}
-
-/**
- * Searches content for shortcodes and filter shortcodes through their hooks.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * If there are no shortcode tags defined, then the content will be returned
</span><span class="cx" style="display: block; padding: 0 10px"> * without any filtering. This might cause issues when plugins are disabled but
</span><span class="cx" style="display: block; padding: 0 10px"> * the shortcode will still show up in the post or content.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 2.5.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.4.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $shortcode_tags List of shortcode tags and their callback hooks.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +184,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Content with shortcodes filtered out.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function do_shortcode( $content, $ignore_html = false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function apply_shortcodes( $content, $ignore_html = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $shortcode_tags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === strpos( $content, '[' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,6 +215,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Searches content for shortcodes and filter shortcodes through their hooks.
+ *
+ * This function is an alias for apply_shortcodes().
+ *
+ * @since 2.5.0
+ *
+ * @see apply_shortcodes()
+ *
+ * @param string $content Content to search for shortcodes.
+ * @param bool $ignore_html When true, shortcodes inside HTML elements will be skipped.
+ * Default false.
+ * @return string Content with shortcodes filtered out.
+ */
+function do_shortcode( $content, $ignore_html = false ) {
+ return apply_shortcodes( $content, $ignore_html );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Retrieves the shortcode regular expression for searching.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The regular expression combines the shortcode tags in the regular expression
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +299,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Regular Expression callable for do_shortcode() for calling shortcode hook.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Regular Expression callable for apply_shortcodes() for calling shortcode hook.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_shortcode_regex() for details of the match array contents.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgettextphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-text.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-text.php 2022-09-20 09:57:43 UTC (rev 54247)
+++ trunk/src/wp-includes/widgets/class-wp-widget-text.php 2022-09-20 10:29:55 UTC (rev 54248)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,9 +244,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Suspend legacy plugin-supplied do_shortcode() for 'widget_text' filter for the visual Text widget to prevent
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * shortcodes being processed twice. Now do_shortcode() is added to the 'widget_text_content' filter in core itself
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * shortcodes being processed twice. Now apply_shortcodes() is added to the 'widget_text_content' filter in core itself
</ins><span class="cx" style="display: block; padding: 0 10px"> * and it applies after wpautop() to prevent corrupting HTML output added by the shortcode. When do_shortcode() is
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * added to 'widget_text_content' then do_shortcode() will be manually called when in legacy mode as well.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * added to 'widget_text_content' then apply_shortcodes() will be manually called when in legacy mode as well.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_text_do_shortcode_priority = has_filter( 'widget_text', 'do_shortcode' );
</span><span class="cx" style="display: block; padding: 0 10px"> $should_suspend_legacy_shortcode_support = ( $is_visual_text_widget && false !== $widget_text_do_shortcode_priority );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,9 +302,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Manually do shortcodes on the content when the core-added filter is present. It is added by default
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * in core by adding do_shortcode() to the 'widget_text_content' filter to apply after wpautop().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * in core by adding apply_shortcodes() to the 'widget_text_content' filter to apply after wpautop().
</ins><span class="cx" style="display: block; padding: 0 10px"> * Since the legacy Text widget runs wpautop() after 'widget_text' filters are applied, the widget in
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * legacy mode here manually applies do_shortcode() on the content unless the default
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * legacy mode here manually applies apply_shortcodes() on the content unless the default
</ins><span class="cx" style="display: block; padding: 0 10px"> * core filter for 'widget_text_content' has been removed, or if do_shortcode() has already
</span><span class="cx" style="display: block; padding: 0 10px"> * been applied via a plugin adding do_shortcode() to 'widget_text' filters.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,7 +312,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $instance['filter'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $text = shortcode_unautop( $text );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = do_shortcode( $text );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $text = apply_shortcodes( $text );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>