From a7ddf24f3de2ecff688c729ce57cd4eafff3f8ae Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Wed, 23 Nov 2016 17:35:32 +0000 Subject: [PATCH] Docs: Add a missing changelog entry for the point where the `$tagnames` parameter was added to `get_shortcode_regex()`. Props keesiemeijer. Fixes #38914. Built from https://develop.svn.wordpress.org/trunk@39351 git-svn-id: http://core.svn.wordpress.org/trunk@39291 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/shortcodes.php | 3 ++- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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.