vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-06 13:44:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Shortcodes: Revert recent apply_shortcodes and do_shortcode changes.

Browse Source 
[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.

git-svn-id: https://develop.svn.wordpress.org/trunk@54319 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
David Baumwald
2022-09-26 22:41:11 +00:00
parent 2ae8079732
commit 5eddc8f18c
6 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/wp-includes/shortcodes.php
View File

@@ -21,7 +21,7 @@
*
* To apply shortcode tags to content:
*
* $out = apply_shortcodes( $content );
* $out = do_shortcode( $content );
*
* @link https://developer.wordpress.org/plugins/shortcodes/
*
@@ -168,6 +168,24 @@ function has_shortcode( $content, $tag ) {
return false;
}
/**
* Searches content for shortcodes and filter shortcodes through their hooks.
*
* 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.
*
@@ -175,7 +193,7 @@ function has_shortcode( $content, $tag ) {
* without any filtering. This might cause issues when plugins are disabled but
* the shortcode will still show up in the post or content.
*
* @since 5.4.0
* @since 2.5.0
*
* @global array $shortcode_tags List of shortcode tags and their callback hooks.
*
@@ -184,7 +202,7 @@ function has_shortcode( $content, $tag ) {
* Default false.
* @return string Content with shortcodes filtered out.
*/
function apply_shortcodes( $content, $ignore_html = false ) {
function do_shortcode( $content, $ignore_html = false ) {
global $shortcode_tags;
if ( false === strpos( $content, '[' ) ) {
@@ -214,24 +232,6 @@ function apply_shortcodes( $content, $ignore_html = false ) {
return $content;
}
/**
* 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 );
}
/**
* Retrieves the shortcode regular expression for searching.
*
@@ -299,7 +299,7 @@ function get_shortcode_regex( $tagnames = null ) {
}
/**
* Regular Expression callable for apply_shortcodes() for calling shortcode hook.
* Regular Expression callable for do_shortcode() for calling shortcode hook.
*
* @see get_shortcode_regex() for details of the match array contents.
*