From 9b3a895631ca7cd96841a75a9101611d5b8a0086 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 21 Dec 2019 20:12:03 +0000
Subject: [PATCH] Shortcodes: Introduce `apply_shortcodes()` as an alias for
 `do_shortcode()`.

This better aligns with the semantics of applying filters to the input and returning a result, rather than performing an action and outputting to the current buffer.

Props ljasinskipl, thefarlilacfield.
Fixes #37422.
Built from https://develop.svn.wordpress.org/trunk@47004


git-svn-id: http://core.svn.wordpress.org/trunk@46804 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/shortcodes.php | 23 +++++++++++++++++++++--
 wp-includes/version.php    |  2 +-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index a5e806b40d..06ef90d868 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -159,6 +159,24 @@ function has_shortcode( $content, $tag ) {
 	return false;
 }
 
+/**
+ * Search 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 );
+}
+
 /**
  * Search content for shortcodes and filter shortcodes through their hooks.
  *
@@ -170,8 +188,9 @@ function has_shortcode( $content, $tag ) {
  *
  * @global array $shortcode_tags List of shortcode tags and their callback hooks.
  *
- * @param string $content Content to search for shortcodes.
- * @param bool $ignore_html When true, shortcodes inside HTML elements will be skipped.
+ * @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 ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index af979f6031..4cf8d90313 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-47003';
+$wp_version = '5.4-alpha-47004';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.