diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php index 3af0e10f58..32720cd276 100644 --- a/wp-includes/shortcodes.php +++ b/wp-includes/shortcodes.php @@ -244,10 +244,11 @@ function do_shortcode( $content, $ignore_html = false ) { * 6 - An extra ] to allow for escaping shortcodes with double [[]] * * @since 2.5.0 + * @since 4.4.0 Added the `$tagnames` parameter. * * @global array $shortcode_tags * - * @param array $tagnames List of shortcodes to find. Optional. Defaults to all registered shortcodes. + * @param array $tagnames Optional. List of shortcodes to find. Defaults to all registered shortcodes. * @return string The shortcode search regular expression */ function get_shortcode_regex( $tagnames = null ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index a7eee4dfa8..4a5351b2b5 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-beta4-39350'; +$wp_version = '4.7-beta4-39351'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.