From 298b0d0676504e3698295c87de8779f8d06fc5ba Mon Sep 17 00:00:00 2001 From: dd32 Date: Tue, 3 Jan 2017 03:57:03 +0000 Subject: [PATCH] Shortcodes: Clarify the docs for `pre_do_shortcode_tag` and `do_shortcode_tag`. Props dhanendran. Fixes #39294. git-svn-id: https://develop.svn.wordpress.org/trunk@39665 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/shortcodes.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wp-includes/shortcodes.php b/src/wp-includes/shortcodes.php index 32720cd276..4120683637 100644 --- a/src/wp-includes/shortcodes.php +++ b/src/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 ); }