Make WordPress Core


Ignore:
Timestamp:
09/26/2022 10:41:11 PM (22 months ago)
Author:
davidbaumwald
Message:

Shortcodes: Revert recent apply_shortcodes and do_shortcode changes.

[54248] reversed the wrapping of do_shortcode and apply_shortcodes and updated all direct internal calls of do_shortcode to apply_shortcodes after [47004]. After further consideration, the long history of do_shortcodes should be favored over any subjective semantic improvements. This change reverts the remaining changes from #55883 not already reverted in [54278].

Follow-up to [47004], [54248], and [54278].

Props azaozz, jorbin.
See #55883.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/shortcodes.php

    r54248 r54319  
    2222 * To apply shortcode tags to content:
    2323 *
    24  *     $out = apply_shortcodes( $content );
     24 *     $out = do_shortcode( $content );
    2525 *
    2626 * @link https://developer.wordpress.org/plugins/shortcodes/
     
    172172 * Searches content for shortcodes and filter shortcodes through their hooks.
    173173 *
    174  * If there are no shortcode tags defined, then the content will be returned
    175  * without any filtering. This might cause issues when plugins are disabled but
    176  * the shortcode will still show up in the post or content.
     174 * This function is an alias for do_shortcode().
    177175 *
    178176 * @since 5.4.0
    179177 *
    180  * @global array $shortcode_tags List of shortcode tags and their callback hooks.
     178 * @see do_shortcode()
    181179 *
    182180 * @param string $content     Content to search for shortcodes.
     
    186184 */
    187185function apply_shortcodes( $content, $ignore_html = false ) {
    188     global $shortcode_tags;
    189 
    190     if ( false === strpos( $content, '[' ) ) {
    191         return $content;
    192     }
    193 
    194     if ( empty( $shortcode_tags ) || ! is_array( $shortcode_tags ) ) {
    195         return $content;
    196     }
    197 
    198     // Find all registered tag names in $content.
    199     preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
    200     $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
    201 
    202     if ( empty( $tagnames ) ) {
    203         return $content;
    204     }
    205 
    206     $content = do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames );
    207 
    208     $pattern = get_shortcode_regex( $tagnames );
    209     $content = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $content );
    210 
    211     // Always restore square braces so we don't break things like <!--[if IE ]>.
    212     $content = unescape_invalid_shortcodes( $content );
    213 
    214     return $content;
     186    return do_shortcode( $content, $ignore_html );
    215187}
    216188
     
    218190 * Searches content for shortcodes and filter shortcodes through their hooks.
    219191 *
    220  * This function is an alias for apply_shortcodes().
    221  *
    222  * @since 2.5.0
    223  *
    224  * @see apply_shortcodes()
     192 * If there are no shortcode tags defined, then the content will be returned
     193 * without any filtering. This might cause issues when plugins are disabled but
     194 * the shortcode will still show up in the post or content.
     195 *
     196 * @since 2.5.0
     197 *
     198 * @global array $shortcode_tags List of shortcode tags and their callback hooks.
    225199 *
    226200 * @param string $content     Content to search for shortcodes.
     
    230204 */
    231205function do_shortcode( $content, $ignore_html = false ) {
    232     return apply_shortcodes( $content, $ignore_html );
     206    global $shortcode_tags;
     207
     208    if ( false === strpos( $content, '[' ) ) {
     209        return $content;
     210    }
     211
     212    if ( empty( $shortcode_tags ) || ! is_array( $shortcode_tags ) ) {
     213        return $content;
     214    }
     215
     216    // Find all registered tag names in $content.
     217    preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
     218    $tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
     219
     220    if ( empty( $tagnames ) ) {
     221        return $content;
     222    }
     223
     224    $content = do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames );
     225
     226    $pattern = get_shortcode_regex( $tagnames );
     227    $content = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $content );
     228
     229    // Always restore square braces so we don't break things like <!--[if IE ]>.
     230    $content = unescape_invalid_shortcodes( $content );
     231
     232    return $content;
    233233}
    234234
     
    300300
    301301/**
    302  * Regular Expression callable for apply_shortcodes() for calling shortcode hook.
     302 * Regular Expression callable for do_shortcode() for calling shortcode hook.
    303303 *
    304304 * @see get_shortcode_regex() for details of the match array contents.
Note: See TracChangeset for help on using the changeset viewer.