From 5eb2277dce2ee8a388cf86d112c5ae93809479a4 Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Tue, 3 Jan 2017 04:00:18 +0000
Subject: [PATCH] Shortcodes: Clarify the docs for `pre_do_shortcode_tag` and
 `do_shortcode_tag`.

Props dhanendran.
Fixes #39294.

Built from https://develop.svn.wordpress.org/trunk@39665


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

diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index 32720cd276..4120683637 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -331,9 +331,9 @@ function do_shortcode_tag( $m ) {
 	 * @since 4.7.0
 	 *
 	 * @param bool|string $return      Short-circuit return value. Either false or the value to replace the shortcode with.
-	 * @param string      $tag         Shortcode name.
-	 * @param array       $attr        Shortcode attributes array,
-	 * @param array       $m           Regular expression match array.
+	 * @param string       $tag         Shortcode name.
+	 * @param array|string $attr        Shortcode attributes array or empty string.
+	 * @param array        $m           Regular expression match array.
 	 */
 	$return = apply_filters( 'pre_do_shortcode_tag', false, $tag, $attr, $m );
 	if ( false !== $return ) {
@@ -350,9 +350,9 @@ function do_shortcode_tag( $m ) {
 	 * @since 4.7.0
 	 *
 	 * @param string $output Shortcode output.
-	 * @param string $tag    Shortcode name.
-	 * @param array  $attr   Shortcode attributes array,
-	 * @param array  $m      Regular expression match array.
+	 * @param string       $tag    Shortcode name.
+	 * @param array|string $attr   Shortcode attributes array or empty string.
+	 * @param array        $m      Regular expression match array.
 	 */
 	return apply_filters( 'do_shortcode_tag', $output, $tag, $attr, $m );
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 78afce6aa4..d042a6f93d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.8-alpha-39663';
+$wp_version = '4.8-alpha-39665';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.